[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1117235: kget: diff for NMU version 4:25.04.0-1.1



Control: tags 1117235 + pending

Dear maintainer,

I've prepared an NMU for kget (versioned as 4:25.04.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should cancel it.

Regards.

-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diffstat for kget-25.04.0 kget-25.04.0

 changelog                        |    8 ++++++++
 patches/01_fix-build-gpgme2.diff |   26 ++++++++++++++++++++++++++
 patches/series                   |    1 +
 3 files changed, 35 insertions(+)

diff -Nru kget-25.04.0/debian/changelog kget-25.04.0/debian/changelog
--- kget-25.04.0/debian/changelog	2025-04-17 22:26:31.000000000 +0200
+++ kget-25.04.0/debian/changelog	2025-11-06 15:59:20.000000000 +0100
@@ -1,3 +1,11 @@
+kget (4:25.04.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Cherry-pick fix from upstream to fix FTBFS against gpgme* 2.
+    Closes: #1117235
+
+ -- Andreas Metzler <ametzler@debian.org>  Thu, 06 Nov 2025 15:59:20 +0100
+
 kget (4:25.04.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff -Nru kget-25.04.0/debian/patches/01_fix-build-gpgme2.diff kget-25.04.0/debian/patches/01_fix-build-gpgme2.diff
--- kget-25.04.0/debian/patches/01_fix-build-gpgme2.diff	1970-01-01 01:00:00.000000000 +0100
+++ kget-25.04.0/debian/patches/01_fix-build-gpgme2.diff	2025-11-06 15:58:14.000000000 +0100
@@ -0,0 +1,26 @@
+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
+---
+ ui/signaturedlg.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/signaturedlg.cpp b/ui/signaturedlg.cpp
+index 7c4a97f14..0b6a07853 100644
+--- 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
+
diff -Nru kget-25.04.0/debian/patches/series kget-25.04.0/debian/patches/series
--- kget-25.04.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ kget-25.04.0/debian/patches/series	2025-11-06 15:58:17.000000000 +0100
@@ -0,0 +1 @@
+01_fix-build-gpgme2.diff

Attachment: signature.asc
Description: PGP signature


Reply to: