[PR PATCH] seahorse: allow building with GnuPG-2.4.x

[PR PATCH] seahorse: allow building with GnuPG-2.4.x

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

There is a new pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages seahorse-gpg2.4
https://github.com/void-linux/void-packages/pull/42055

seahorse: allow building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet

- I tested the changes in this PR: see #41948

A patch file from https://github.com/void-linux/void-packages/pull/42055.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seahorse-gpg2.4-42055.patch --]
[-- Type: text/x-diff, Size: 1689 bytes --]

From 215fcd19d6a27e6285acac217e00d711c02494db Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH] seahorse: allow building with GnuPG-2.4.x

This patch is taken from upstream but is not in any released version yet
---
 .../patches/allow-building-with-gpg-2.4.patch       | 13 +++++++++++++
 srcpkgs/seahorse/template                           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch

diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..bb904d10451f
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index e29b532236e5543682832725d79dea0c7e49f8bf..23d0b54f567c112249fc72ddb91ac8e40218c60b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8..da92234d8216 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse'
 pkgname=seahorse
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel

Re: seahorse: allow building with GnuPG-2.4.x

[paper42]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42055#issuecomment-1416191081

Comment:
If this patch is from upstream, please don't remove the header - author, subject, commit message, etc.

Re: [PR PATCH] [Updated] seahorse: allow building with GnuPG-2.4.x

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages seahorse-gpg2.4
https://github.com/void-linux/void-packages/pull/42055

seahorse: allow building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet

- I tested the changes in this PR: see #41948

A patch file from https://github.com/void-linux/void-packages/pull/42055.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seahorse-gpg2.4-42055.patch --]
[-- Type: text/x-diff, Size: 1911 bytes --]

From 98233e6ebe6ff392e30464285573dec7056006ec Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH] seahorse: allow building with GnuPG-2.4.x

This patch is taken from upstream but is not in any released version yet
---
 .../patches/allow-building-with-gpg-2.4.patch | 25 +++++++++++++++++++
 srcpkgs/seahorse/template                     |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch

diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..fca2c139b3c6
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
+-- 
+2.39.1
+
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index be8ba454b4a8..da92234d8216 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse'
 pkgname=seahorse
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel

Re: seahorse: allow building with GnuPG-2.4.x

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42055#issuecomment-1416212548

Comment:
This should be the proper `git format-patch` output.

Re: [PR REVIEW] seahorse: allow building with GnuPG-2.4.x

[paper42]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42055#discussion_r1096344511

Comment:
as far as I can tell, this doesn't affect the resulting package, so a revbump is not necessary 

Re: [PR REVIEW] seahorse: allow building with GnuPG-2.4.x

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New review comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42055#discussion_r1096402063

Comment:
+1

Re: [PR PATCH] [Updated] seahorse: allow building with GnuPG-2.4.x

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages seahorse-gpg2.4
https://github.com/void-linux/void-packages/pull/42055

seahorse: allow building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet

- I tested the changes in this PR: see #41948

A patch file from https://github.com/void-linux/void-packages/pull/42055.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seahorse-gpg2.4-42055.patch --]
[-- Type: text/x-diff, Size: 1451 bytes --]

From 862e2559073f42cafadb6999f0755edffa54c5c5 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH] seahorse: allow building with GnuPG-2.4.x

This patch is taken from upstream but is not in any released version yet
---
 .../patches/allow-building-with-gpg-2.4.patch | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch

diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..fca2c139b3c6
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
+-- 
+2.39.1
+

Re: [PR PATCH] [Merged]: seahorse: allow building with GnuPG-2.4.x

[paper42]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

There's a merged pull request on the void-packages repository

seahorse: allow building with GnuPG-2.4.x
https://github.com/void-linux/void-packages/pull/42055

Description:
This patch is taken from upstream but is not in any released version yet

- I tested the changes in this PR: see #41948