[Pkg-privacy-commits] [Git][pkg-privacy-team/seahorse-nautilus][debian/master] 2 commits: Add patch to fix build with gnupg2 2.4
Jeremy Bícha (@jbicha)
gitlab at salsa.debian.org
Sat Apr 12 22:53:07 BST 2025
Jeremy Bícha pushed to branch debian/master at Privacy Maintainers / seahorse-nautilus
Commits:
0b7ee450 by Jeremy Bícha at 2025-04-12T17:52:39-04:00
Add patch to fix build with gnupg2 2.4
Closes: #1102783
- - - - -
422cd27b by Jeremy Bícha at 2025-04-12T17:52:51-04:00
releasing package seahorse-nautilus version 3.11.92+git20230129.d59dc92f-2
- - - - -
6 changed files:
- + debian/.control.swp
- debian/changelog
- debian/patches/fix-warnings.patch
- debian/patches/meson_use_dependency_for_gpme.patch
- + debian/patches/seahorse-nautilus-fix_gnupg2_ver.patch
- debian/patches/series
Changes:
=====================================
debian/.control.swp
=====================================
Binary files /dev/null and b/debian/.control.swp differ
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+seahorse-nautilus (3.11.92+git20230129.d59dc92f-2) unstable; urgency=medium
+
+ * Team upload
+ * Add patch to fix build with gnupg2 2.4 (Closes: #1102783)
+
+ -- Jeremy Bícha <jbicha at ubuntu.com> Sat, 12 Apr 2025 17:52:42 -0400
+
seahorse-nautilus (3.11.92+git20230129.d59dc92f-1) unstable; urgency=medium
[ Chris Lamb ]
=====================================
debian/patches/fix-warnings.patch
=====================================
@@ -7,8 +7,6 @@ Author: Carlos Maddela <e7appew at gmail.com>
Origin: vendor
Forwarded: https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/issues/1
Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
tool/seahorse-notification.c | 2 +-
tool/seahorse-operation.c | 2 +-
@@ -18,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tool/seahorse-notification.c b/tool/seahorse-notification.c
-index 52f46d5..f84c7b4 100644
+index 61c4321..d246312 100644
--- a/tool/seahorse-notification.c
+++ b/tool/seahorse-notification.c
@@ -66,7 +66,7 @@ typedef struct _SeahorseNotificationClass {
@@ -57,7 +55,7 @@ index ca70b8f..c8b9840 100644
GError *error;
diff --git a/tool/seahorse-util.c b/tool/seahorse-util.c
-index eee092c..789b7d5 100644
+index 0ff1bd9..8c399ee 100644
--- a/tool/seahorse-util.c
+++ b/tool/seahorse-util.c
@@ -56,9 +56,9 @@ seahorse_util_show_error (GtkWindow *parent, const gchar *heading, const gchar *
@@ -74,7 +72,7 @@ index eee092c..789b7d5 100644
gtk_dialog_run (GTK_DIALOG (error));
gtk_widget_destroy (error);
diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
-index bb75c0e..df487ac 100644
+index 1955823..10c2592 100644
--- a/tool/seahorse-widget.c
+++ b/tool/seahorse-widget.c
@@ -168,16 +168,16 @@ object_finalize (GObject *gobject)
=====================================
debian/patches/meson_use_dependency_for_gpme.patch
=====================================
@@ -1,15 +1,27 @@
-Description: meson: Use dependency() for gpme
- Since version 0.51, we can rely on Meson to do the correct thing when
- calling `dependency('gpgme')`. This makes both the meson.build and the
- GPG version checking script quite a bit cleaner.
- It also remove the need for gpgme-config which isn't shipped currently
- in Debian by libgpgme-dev, by using pkgconfig.
- This patch is mostly an adaptation of https://gitlab.gnome.org/GNOME/seahorse/-/commit/f862919765f92640016604e65eb6c535fa9a80a2.
+From: =?utf-8?q?Cl=C3=A9ment_Hermann?= <nodens at debian.org>
+Date: Mon, 30 Jan 2023 14:28:19 +0000
+Subject: meson: Use dependency() for gpme
+
+Since version 0.51, we can rely on Meson to do the correct thing when
+calling `dependency('gpgme')`. This makes both the meson.build and the
+GPG version checking script quite a bit cleaner.
+
+It also remove the need for gpgme-config which isn't shipped currently
+in Debian by libgpgme-dev, by using pkgconfig.
+
+This patch is mostly an adaptation of
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/f862919765f92640016604e65eb6c535fa9a80a2
+
Origin: other, https://gitlab.gnome.org/GNOME/seahorse/-/commit/f862919765f92640016604e65eb6c535fa9a80a2
Forwarded: https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/issues/9
-Last-Update: 2023-01-30
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ meson.build | 15 +++------------
+ meson/gpg_check_version.py | 20 ++++++++------------
+ tool/meson.build | 2 +-
+ 3 files changed, 12 insertions(+), 25 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c1efbfb..4e9fc04 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
@@ -20,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
license: 'GPL2+',
)
-@@ -27,7 +27,6 @@
+@@ -27,7 +27,6 @@ config_h_dir = include_directories('.')
min_glib_version = '2.44'
min_gtk_version = '3.18'
accepted_gpg_versions= ['1.2.0', '1.4.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0']
@@ -28,7 +40,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
libnautilus_extension = dependency('libnautilus-extension-4', version: '>= 43.rc', required: false)
if not libnautilus_extension.found()
-@@ -50,22 +49,14 @@
+@@ -50,22 +49,14 @@ endif
gpg_check_version = find_program(join_paths('meson', 'gpg_check_version.py'))
gpg_bin = find_program('gpg2', 'gpg')
@@ -53,9 +65,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
endif
# Configuration
+diff --git a/meson/gpg_check_version.py b/meson/gpg_check_version.py
+index 4f1ccaf..bad1036 100755
--- a/meson/gpg_check_version.py
+++ b/meson/gpg_check_version.py
-@@ -4,28 +4,24 @@
+@@ -4,28 +4,24 @@ import sys
import subprocess
# Parses the GPG version from the output of the --version flag.
@@ -91,7 +105,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Parse and print the version
proc = subprocess.Popen([gpg_path, '--version'],
-@@ -36,7 +32,7 @@
+@@ -36,7 +32,7 @@ print(gpg_version, end='')
# Then return whether we're compatible with that version
for accepted_version in accepted_versions:
@@ -100,9 +114,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sys.exit(0)
sys.exit(1)
+diff --git a/tool/meson.build b/tool/meson.build
+index 7791305..ddb196c 100644
--- a/tool/meson.build
+++ b/tool/meson.build
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ seahorse_tool_dependencies = [
gtk,
gcr,
cryptui,
=====================================
debian/patches/seahorse-nautilus-fix_gnupg2_ver.patch
=====================================
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha at canonical.com>
+Date: Sat, 12 Apr 2025 17:43:55 -0400
+Subject: Update gpg versions
+
+Origin: the upstream project is archived so there is no where to forward this patch
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 4e9fc04..e0afdfa 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ config_h_dir = include_directories('.')
+ # Dependencies
+ min_glib_version = '2.44'
+ min_gtk_version = '3.18'
+-accepted_gpg_versions= ['1.2.0', '1.4.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0']
++accepted_gpg_versions= ['1.2.0', '1.4.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0', '2.4.0']
+
+ libnautilus_extension = dependency('libnautilus-extension-4', version: '>= 43.rc', required: false)
+ if not libnautilus_extension.found()
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
fix-warnings.patch
meson_use_dependency_for_gpme.patch
+seahorse-nautilus-fix_gnupg2_ver.patch
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus/-/compare/8196f48ee7a1e4b270f4d541669b1887a11c20cf...422cd27b84b8c366758e52b22334a0ff4d55fbb7
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus/-/compare/8196f48ee7a1e4b270f4d541669b1887a11c20cf...422cd27b84b8c366758e52b22334a0ff4d55fbb7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20250412/c77a4e36/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list