user/[KDE Apps]: Update to 22.04.2

3 files changed, 47 insertions, 41 deletions

diff --git a/user/lokalize/APKBUILD b/user/lokalize/APKBUILD
index 1dab84a20..e2f412b6e 100644
--- a/user/lokalize/APKBUILD
+++ b/user/lokalize/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=lokalize
-pkgver=20.08.1
+pkgver=22.04.2
 pkgrel=0
 pkgdesc="Computer-aided translation system"
 url="https://kde.org/applications/development/org.kde.lokalize"
@@ -17,7 +17,7 @@ makedepends="qt5-qtbase-dev qt5-qtscript-dev cmake extra-cmake-modules kauth-dev
 	hunspell-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz
-	lts.patch
+	tests.patch
 	"
 
 build() {
@@ -44,5 +44,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9ac2990ee4147114e42ae0098e65ea608a8052d836b5d8a4a4b721d1fa631f6e40a21431ef8c00c03adb7fcc668ea76704f3be207c74347480c33f59ad4f6a22  lokalize-20.08.1.tar.xz
-75b6e97aec4941b7d9ae2d84df58a5f9554169d91dffbf765ee780f8d408bb8aad1f581d8213194df843159677dde9170663740ca78ac7ac3655165dae1fea26  lts.patch"
+sha512sums="f6a5da60e5d6155f2decab11a887fb3e13720857cafd54d435298c642c3bbc097e63389ebe5c031987ceb70f413f88abe66caa6213576abce9a48a73a4b00140  lokalize-22.04.2.tar.xz
+9b71a96a8a72ee23fea7dd051028f6652842023bf027f82cfb65c12e39033e76f9f548cf6999dc9fca6ee459f6260888253e94ad6cb08ef9c12013a6faa663a8  tests.patch"
diff --git a/user/lokalize/lts.patch b/user/lokalize/lts.patch
deleted file mode 100644
index 755fdd610..000000000
--- a/user/lokalize/lts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-12c12
-< set(QT_MIN_VERSION "5.14.0")
----
-> set(QT_MIN_VERSION "5.12.9")
---- lokalize-20.08.1/CMakeLists.txt.old	2020-09-01 06:29:46.000000000 +0000
-+++ lokalize-20.08.1/CMakeLists.txt	2020-09-17 15:42:19.559171111 +0000
-@@ -9,7 +9,7 @@
- 
- project(lokalize VERSION ${RELEASE_SERVICE_VERSION})
- 
--set(QT_MIN_VERSION "5.14.0")
-+set(QT_MIN_VERSION "5.12.9")
- set(KF5_MIN_VERSION "5.71.0")
- 
- # search packages used
---- lokalize-20.08.1/src/glossary/glossaryview.cpp.old	2020-08-31 19:21:04.000000000 +0000
-+++ lokalize-20.08.1/src/glossary/glossaryview.cpp	2020-09-18 02:08:40.084992048 +0000
-@@ -166,7 +166,7 @@
- 
-     bool found = false;
-     //m_flowLayout->setEnabled(false);
--    foreach (const QByteArray& termId, QSet<QByteArray>(termIds.begin(), termIds.end())) {
-+    foreach (const QByteArray& termId, termIds.toSet()) {
-         // now check which of them are really hits...
-         foreach (const QString& enTerm, glossary.terms(termId, sourceLangCode)) {
-             // ...and if so, which part of termEn list we must thank for match ...
---- lokalize-20.08.1/src/tests/projectmodeltest.cpp.old	2020-08-31 19:21:04.000000000 +0000
-+++ lokalize-20.08.1/src/tests/projectmodeltest.cpp	2020-09-18 02:19:03.517276672 +0000
-@@ -87,7 +87,7 @@
-     model->setUrl(QUrl::fromLocalFile(QFINDTESTDATA("data/dir-halftranslated")), {});
- 
-     // Wait for signal
--    while (!loaded.loadRelaxed()) {
-+    while (!loaded.load()) {
-         QCoreApplication::processEvents();
-     }
- 
diff --git a/user/lokalize/tests.patch b/user/lokalize/tests.patch
new file mode 100644
index 000000000..cc0a4b457
--- /dev/null
+++ b/user/lokalize/tests.patch
@@ -0,0 +1,43 @@
+From 62849badfa30354435510c4dcf5ce0e7d644e934 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sat, 11 Jun 2022 22:22:35 -0500
+Subject: [PATCH] tests: Fix Project model test for new column
+
+The Project model has a new column, "Comments", added in 2020.  The
+tests weren't updated to handle that and were failing because the column
+numbers changed.
+
+Fixes: b1e37cc7dc95 ("Adding a comment feature on Project files")
+---
+ src/tests/projectmodeltest.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/tests/projectmodeltest.cpp b/src/tests/projectmodeltest.cpp
+index 33e940f4..c8b55457 100644
+--- a/src/tests/projectmodeltest.cpp
++++ b/src/tests/projectmodeltest.cpp
+@@ -54,6 +54,7 @@ void ProjectModelTest::testInvalid()
+     QCOMPARE(model->data(model->index(0, 7), Qt::DisplayRole), QString());
+     QCOMPARE(model->data(model->index(0, 8), Qt::DisplayRole), QString());
+     QCOMPARE(model->data(model->index(0, 9), Qt::DisplayRole), QString());
++    QCOMPARE(model->data(model->index(0, 10), Qt::DisplayRole), QString());
+ }
+ 
+ void ProjectModelTest::testHalfTranslated()
+@@ -85,9 +86,10 @@ void ProjectModelTest::testHalfTranslated()
+     QCOMPARE(model->data(model->index(0, 4), Qt::DisplayRole), 1);
+     QCOMPARE(model->data(model->index(0, 5), Qt::DisplayRole), 2);
+     QCOMPARE(model->data(model->index(0, 6), Qt::DisplayRole), 3);
+-    QCOMPARE(model->data(model->index(0, 7), Qt::DisplayRole), QStringLiteral("2019-05-20 03:26+0200"));
+-    QCOMPARE(model->data(model->index(0, 8), Qt::DisplayRole), QStringLiteral("2019-06-13 08:53+0300"));
+-    QCOMPARE(model->data(model->index(0, 9), Qt::DisplayRole), QStringLiteral("Alexander Potashev <aspotashev@gmail.com>"));
++    QCOMPARE(model->data(model->index(0, 7), Qt::DisplayRole), QStringLiteral());
++    QCOMPARE(model->data(model->index(0, 8), Qt::DisplayRole), QStringLiteral("2019-05-20 03:26+0200"));
++    QCOMPARE(model->data(model->index(0, 9), Qt::DisplayRole), QStringLiteral("2019-06-13 08:53+0300"));
++    QCOMPARE(model->data(model->index(0, 10), Qt::DisplayRole), QStringLiteral("Alexander Potashev <aspotashev@gmail.com>"));
+ }
+ 
+ QTEST_GUILESS_MAIN(ProjectModelTest)
+-- 
+2.36.0
+