user/[KDE Utilities]: Bump to 19.12.0

2 files changed, 4 insertions, 97 deletions

diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD
index f8ed88504..50d368ea4 100644
--- a/user/kleopatra/APKBUILD
+++ b/user/kleopatra/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kleopatra
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Certificate manager and cryptography GUI"
 url="https://www.kde.org/applications/utilities/kleopatra/"
@@ -12,12 +12,9 @@ depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev
 	libassuan-dev kitemmodels-dev kmime-dev knotifications-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz
-	qt5.9.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -28,19 +25,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d2eb5a02e937a93a1c8c20e418203e580f37548e4dcc2ba9519dec244a04f355a32e9daa9acecfc51e6b63f7f1274882a7eb4ac23e6c73f67d5c292d05a50027  kleopatra-19.08.2.tar.xz
-4f1330881b582d3b730ee8001eedd6cd18ba14d21d7e80056c8bec1052691f580fd055fa762565449e2c820dbdcd133077ab61f98de8215f88459e32afd609bd  qt5.9.patch"
+sha512sums="4f5710a5fd15ec8205156f45efba824da3a8c4dfa075f55367eff42a8ccb1e07ed519bbc8af2cc1df1ea058b67318cc40171134cfa4db3dd338a067c33af6035  kleopatra-19.12.0.tar.xz"
diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch
deleted file mode 100644
index b6f182029..000000000
--- a/user/kleopatra/qt5.9.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001
-Date: Mon, 17 Dec 2018 08:12:46 +0100
-Subject: Revert "Remove QT_CHECK"
-
----
- src/commands/certifycertificatecommand.cpp | 4 ++++
- src/commands/importcertificatescommand.cpp | 4 ++++
- src/dialogs/certificateselectiondialog.cpp | 4 ++++
- 3 files changed, 12 additions(+)
-
-diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp
-index 524b5a6..5577f2f 100644
---- a/src/commands/certifycertificatecommand.cpp
-+++ b/src/commands/certifycertificatecommand.cpp
-@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart()
-             cmd->setParentWidget(d->parentWidgetOrView());
-             cmd->setProtocol(GpgME::OpenPGP);
-             loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-             QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection);
-+#else
-+            QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
-+#endif
-             loop.exec();
-         } else {
-             Q_EMIT(canceled());
-diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp
-index 49294b6..89542cc 100644
---- a/src/commands/importcertificatescommand.cpp
-+++ b/src/commands/importcertificatescommand.cpp
-@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import &
-         auto cmd = new Commands::CertifyCertificateCommand(key);
-         cmd->setParentWidget(parentWidgetOrView());
-         loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-         QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection);
-+#else
-+        QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
-+#endif
-         loop.exec();
-     }
-     return true;
-diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp
-index 003872e..020310d 100644
---- a/src/dialogs/certificateselectiondialog.cpp
-+++ b/src/dialogs/certificateselectiondialog.cpp
-@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i
-     QItemSelectionModel *const sm = view->selectionModel();
-     Q_ASSERT(sm);
-     sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-     QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection);
-+#else
-+    QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection);
-+#endif
- }
- 
- void CertificateSelectionDialog::accept()
--- 
-cgit v1.1
-
---- kleopatra-19.04.0/CMakeLists.txt.old	2019-04-12 00:14:10.000000000 +0000
-+++ kleopatra-19.04.0/CMakeLists.txt	2019-04-19 06:34:58.511578506 +0000
-@@ -11,10 +11,10 @@
- option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
- 
- # Standalone build. Find / include everything necessary.
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
- set(KMIME_VERSION "5.12.1")
- set(LIBKLEO_VERSION "5.12.1")
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- set(GPGME_REQUIRED_VERSION "1.8.0")
- 
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
---- kleopatra-19.08.0/CMakeLists.txt.old	2019-08-15 15:07:20.717152888 +0000
-+++ kleopatra-19.08.0/CMakeLists.txt	2019-08-15 15:09:48.141370261 +0000
-@@ -143,7 +143,7 @@
-     add_subdirectory(tests)
-     add_subdirectory(autotests)
- endif()
--install(FILES kleopatra.renamecategories kleopatra.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+#install(FILES kleopatra.renamecategories kleopatra.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
- 
- if(KF5DocTools_FOUND)
-     add_subdirectory(doc)