[gentoo-commits] repo/gentoo:master commit in: kde-apps/kget/, kde-apps/kget/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kget/, kde-apps/kget/files/

[Sam James]

commit:     d832c461f51a1a97c74087927456de89d4b9f758
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Aug 13 02:13:12 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 13 02:26:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d832c461

kde-apps/kget: fix build against gpgmepp-2

Closes: https://bugs.gentoo.org/961434
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43426
Closes: https://github.com/gentoo/gentoo/pull/43426
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kget/files/kget-25.04.03-fix-gpgmepp-2.patch   | 61 ++++++++++++++++++++++
 kde-apps/kget/kget-25.04.3.ebuild                  |  4 ++
 2 files changed, 65 insertions(+)

diff --git a/kde-apps/kget/files/kget-25.04.03-fix-gpgmepp-2.patch b/kde-apps/kget/files/kget-25.04.03-fix-gpgmepp-2.patch
new file mode 100644
index 000000000000..232e1148cc98
--- /dev/null
+++ b/kde-apps/kget/files/kget-25.04.03-fix-gpgmepp-2.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/961434
+
+https://invent.kde.org/network/kget/-/commit/6254c0cefa17fe82f44842bc21f5e5c241f66aec
+https://invent.kde.org/network/kget/-/merge_requests/100
+
+From 6254c0cefa17fe82f44842bc21f5e5c241f66aec Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 3 Jun 2025 23:13:39 +0200
+Subject: [PATCH] Fix build with GPGME++ 2.0
+
+GpgME::Error is no longer implicitly converted to a string
+--- a/ui/signaturedlg.cpp
++++ b/ui/signaturedlg.cpp
+@@ -185,7 +185,7 @@ void SignatureDlg::updateData()
+             QByteArray fingerprint = fingerprintString.toLatin1();
+             const GpgME::Key key = context->key(fingerprint.constData(), err);
+             if (err || key.isNull() || !key.numUserIDs() || !key.numSubkeys()) {
+-                qCDebug(KGET_DEBUG) << "There was an error while loading the key:" << err;
++                qCDebug(KGET_DEBUG) << "There was an error while loading the key:" << err.asStdString();
+             } else {
+                 static const QStringList OWNERTRUST = QStringList()
+                     << i18nc("trust level", "Unknown") << i18nc("trust level", "Undefined") << i18nc("trust level", "Never") << i18nc("trust level", "Marginal")
+-- 
+GitLab
+
+https://invent.kde.org/network/kget/-/commit/a9aa30e58ca3281285a3ba64d1da6c22fe0ab31a
+https://invent.kde.org/network/kget/-/merge_requests/101
+
+From a9aa30e58ca3281285a3ba64d1da6c22fe0ab31a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 4 Jun 2025 07:26:10 +0000
+Subject: [PATCH] Fix build with GPGME++<1.24
+
+`GpgME::Error::asStdString` was introduced in 1.24
+
+Amends 6254c0cefa17fe82f44842bc21f5e5c241f66aec
+--- a/ui/signaturedlg.cpp
++++ b/ui/signaturedlg.cpp
+@@ -30,6 +30,7 @@
+ #ifdef HAVE_QGPGME
+ #include <gpgme++/context.h>
+ #include <gpgme++/key.h>
++#include <gpgme++/gpgmepp_version.h>
+ #endif
+ 
+ #include <QLayoutItem>
+@@ -185,7 +186,11 @@ void SignatureDlg::updateData()
+             QByteArray fingerprint = fingerprintString.toLatin1();
+             const GpgME::Key key = context->key(fingerprint.constData(), err);
+             if (err || key.isNull() || !key.numUserIDs() || !key.numSubkeys()) {
++#if GPGMEPP_VERSION >= QT_VERSION_CHECK(1, 24, 0)
+                 qCDebug(KGET_DEBUG) << "There was an error while loading the key:" << err.asStdString();
++#else
++                qCDebug(KGET_DEBUG) << "There was an error while loading the key:" << err;
++#endif
+             } else {
+                 static const QStringList OWNERTRUST = QStringList()
+                     << i18nc("trust level", "Unknown") << i18nc("trust level", "Undefined") << i18nc("trust level", "Never") << i18nc("trust level", "Marginal")
+-- 
+GitLab
+

diff --git a/kde-apps/kget/kget-25.04.3.ebuild b/kde-apps/kget/kget-25.04.3.ebuild
index cf652e4d2d83..9e52b6754769 100644
--- a/kde-apps/kget/kget-25.04.3.ebuild
+++ b/kde-apps/kget/kget-25.04.3.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/kget-25.04.03-fix-gpgmepp-2.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package bittorrent KTorrent6)