diff options
Diffstat (limited to 'user/kleopatra')
| -rw-r--r-- | user/kleopatra/APKBUILD | 9 | ||||
| -rw-r--r-- | user/kleopatra/qt5.9.patch | 76 |
2 files changed, 82 insertions, 3 deletions
diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 4dcabff8f..b8a46881b 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=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -12,7 +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" +source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz + qt5.9.patch + " build() { cd "$builddir" @@ -40,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="707fcf4ed9bc2c4d7d45f5911ce1760b49b567865d5f5d315a0af12cb0856e39230c348efbcc449a1e4403f7fb3a0f0ebb654573e0d2bb511d8ff8909f932e6e kleopatra-18.12.3.tar.xz" +sha512sums="c0751d81740b6c590dc1a7e370f99fa09d616b2b9282a862242b2b5235690a4bc36044d08125fbe789ac5470f1aca1525c87752ec40e76c229d37b0eea9cf428 kleopatra-19.04.0.tar.xz +27f03d36e0fdf8f05f59bd3269abc9c60f7f368821a2d6545dd369b046fac4bcb5f9c59a2f50a9d6b3f58d97e767d3596517ed7ed2d72847b68276d60723eb4f qt5.9.patch" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch new file mode 100644 index 000000000..afda4936c --- /dev/null +++ b/user/kleopatra/qt5.9.patch @@ -0,0 +1,76 @@ +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.56.0") ++set(KF5_MIN_VERSION "5.54.0") + set(KMIME_VERSION "5.11.0") + set(LIBKLEO_VERSION "5.11.0") +-set(QT_REQUIRED_VERSION "5.10.0") ++set(QT_REQUIRED_VERSION "5.9.0") + set(GPGME_REQUIRED_VERSION "1.8.0") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) |