[gentoo-commits] repo/gentoo:master commit in: app-crypt/seahorse/, app-crypt/seahorse/files/

2023-04-15 Thread Sam James 
commit: 5eb71eb142a2a51e52580bb81fa42834bf3a7e96
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 15 06:12:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 15 06:12:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb71eb1

app-crypt/seahorse: fix build w/ clang 16

Signed-off-by: Sam James  gentoo.org>

 .../seahorse/files/seahorse-43.0-clang16.patch | 35 ++
 ...orse-43.0-r1.ebuild => seahorse-43.0-r2.ebuild} |  1 +
 2 files changed, 36 insertions(+)

diff --git a/app-crypt/seahorse/files/seahorse-43.0-clang16.patch 
b/app-crypt/seahorse/files/seahorse-43.0-clang16.patch
new file mode 100644
index ..c31fc42709e1
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-43.0-clang16.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/seahorse/-/merge_requests/214
+
+From 3887ba07ccab4aa970c24a22a183b97e255e6ece Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Fri, 14 Apr 2023 14:37:23 +0200
+Subject: [PATCH] Avoid C99 incompatibility around
+ seahorse_pkcs11_backend_initialize
+
+Move the prototype for seahorse_pkcs11_backend_initialize into the
+header file, so C code generated from Vala sources will use it.
+This avoids an implicit function declaration during the C-build
+of src/application.vala, and resulting build failures with future
+compilers.
+--- a/pkcs11/seahorse-pkcs11-backend.c
 b/pkcs11/seahorse-pkcs11-backend.c
+@@ -43,8 +43,6 @@ enum {
+   PROP_LOADED,
+ };
+ 
+-void  seahorse_pkcs11_backend_initialize (void);
+-
+ static SeahorsePkcs11Backend *pkcs11_backend = NULL;
+ 
+ struct _SeahorsePkcs11Backend {
+--- a/pkcs11/seahorse-pkcs11-backend.h
 b/pkcs11/seahorse-pkcs11-backend.h
+@@ -43,4 +43,6 @@ SeahorsePkcs11Backend *  seahorse_pkcs11_backend_get 
  (void);
+ GcrCollection *  seahorse_pkcs11_backend_get_writable_tokens 
(SeahorsePkcs11Backend *self,
+   gulong 
with_mechanism);
+ 
++void  seahorse_pkcs11_backend_initialize (void);
++
+ #endif /* SEAHORSE_PKCS11_BACKEND_H_ */
+-- 
+GitLab

diff --git a/app-crypt/seahorse/seahorse-43.0-r1.ebuild 
b/app-crypt/seahorse/seahorse-43.0-r2.ebuild
similarity index 98%
rename from app-crypt/seahorse/seahorse-43.0-r1.ebuild
rename to app-crypt/seahorse/seahorse-43.0-r2.ebuild
index 876b56992f86..54b472f9d3d2 100644
--- a/app-crypt/seahorse/seahorse-43.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0-r2.ebuild
@@ -50,6 +50,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${P}-gnupg-2.4.patch
"${FILESDIR}"/${P}-musl-stdout.patch
+   "${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-crypt/seahorse/, app-crypt/seahorse/files/

2023-02-28 Thread Sam James 
commit: 53225c643c193984d24283eb9050fe176cd2f101
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  1 05:03:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  1 05:11:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53225c64

app-crypt/seahorse: fix musl build

New revision given it affects Vala-generated code and I'd rather
be conservative.

Signed-off-by: Sam James  gentoo.org>

 .../seahorse/files/seahorse-43.0-musl-stdout.patch | 85 ++
 app-crypt/seahorse/seahorse-43.0-r1.ebuild | 83 +
 2 files changed, 168 insertions(+)

diff --git a/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch 
b/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch
new file mode 100644
index ..2a6873134e27
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch
@@ -0,0 +1,85 @@
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/6d673637d90066f4756568ce1b2f1f3c89a37c74
+
+From 6d673637d90066f4756568ce1b2f1f3c89a37c74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= 
+Date: Thu, 20 Oct 2022 18:35:33 +0200
+Subject: [PATCH] ssh: avoid stdout and stderr variable names
+
+In Alpine Linux, the compiler:
+
+C compiler for the host machine: gcc (gcc 12.2.1 "gcc (Alpine 
12.2.1_git20220924-r3) 12.2.1 20220924")
+C linker for the host machine: gcc ld.bfd 2.39
+Vala compiler for the host machine: valac (valac 0.56.3)
+
+ended up including stdio.h into the C code generated from Vala.
+This produced the following (and similar) errors due to
+stderr and stdout being #define in stdio.h:
+
+ninja: job failed: gcc -Issh/libseahorse-ssh.a.p -Issh -I../ssh -Icommon 
-I../common -I. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 
-I/usr/include/gcr-3 -I/usr/include/gck-1 -I/usr/include/p11-kit-1 
-I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz 
-I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/fribidi 
-I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 
-I/usr/include/libdrm -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include 
-I/usr/include/libhandy-1 -flto=auto -fdiagnostics-color=always 
-D_FILE_OFFSET_BITS=64 -w -O0 -DGCR_API_SUBJECT_TO_CHANGE 
-DGCK_API_SUBJECT_TO_CHANGE -DSECRET_WITH_UNSTABLE -include config.h 
-Wno-unused-parameter -Wno-missing-field-initializers -Os -fomit-frame-pointer 
-Os -fomit-frame-pointer -fPIC -pthread -MD -MQ ssh/libseahorse-ssh.
 a.p/meson-generated_operation.c.o -MF 
ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o.d -o 
ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -c 
ssh/libseahorse-ssh.a.p/operation.c
+In file included from /usr/include/fortify/stdio.h:22,
+ from /usr/include/pango-1.0/pango/pango-utils.h:25,
+ from /usr/include/pango-1.0/pango/pango.h:51,
+ from /usr/include/gtk-3.0/gdk/gdktypes.h:35,
+ from /usr/include/gtk-3.0/gdk/gdkapplaunchcontext.h:30,
+ from /usr/include/gtk-3.0/gdk/gdk.h:32,
+ from /usr/include/gtk-3.0/gtk/gtk.h:30,
+ from common/seahorse-common.h:11,
+ from ssh/seahorse-ssh.h:6,
+ from ssh/libseahorse-ssh.a.p/operation.c:25:
+ssh/libseahorse-ssh.a.p/operation.c: In function 
'seahorse_ssh_operation_operation_async_co':
+ssh/libseahorse-ssh.a.p/operation.c:621:17: error: expected identifier before 
'(' token
+  621 | _data_->stdout = NULL;
+  | ^~
+ssh/libseahorse-ssh.a.p/operation.c:622:17: error: expected identifier before 
'(' token
+  622 | _data_->stderr = NULL;
+  | ^~
+
+Fix the problem by naming the variables std_out and std_err, as it
+was before commit e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Fixes e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Coauthored-by: psykose 
+--- a/ssh/operation.vala
 b/ssh/operation.vala
+@@ -84,12 +84,12 @@ public abstract class Operation : GLib.Object {
+ 
+ // And off we go to run the program
+ var subprocess = launcher.spawnv(args);
+-string? stdout = null, stderr = null;
++string? std_out = null, std_err = null;
+ try {
+-yield subprocess.communicate_utf8_async(input, cancellable, out 
stdout, out stderr);
+-return stdout;
++yield subprocess.communicate_utf8_async(input, cancellable, out 
std_out, out std_err);
++return std_out;
+ } catch (GLib.Error e) {
+-Seahorse.Util.show_error(null, this.prompt_title, stderr);
++Seahorse.Util.show_error(null, this.prompt_title, std_err);
+ throw e;
+ }
+ }
+@@ -221,10 +221,10 @@ public class PrivateImportOperation : Operation {
+ 
+ //

[gentoo-commits] repo/gentoo:master commit in: app-crypt/seahorse/, app-crypt/seahorse/files/

2022-04-17 Thread Matt Turner 
commit: aea89bc6c8acd2a21a97025f6f6ed3afc25fdf18
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 17 06:29:34 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 17 06:30:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea89bc6

app-crypt/seahorse: Add patch to support GnuPG 2.3

Closes: https://bugs.gentoo.org/833513
Signed-off-by: Matt Turner  gentoo.org>

 ...on-fix-gpg-version-check-for-recent-gnupg.patch | 29 ++
 app-crypt/seahorse/seahorse-41.0-r1.ebuild |  4 +++
 2 files changed, 33 insertions(+)

diff --git 
a/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
 
b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
new file mode 100644
index ..2d205e49a43f
--- /dev/null
+++ 
b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
@@ -0,0 +1,29 @@
+From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou 
+Date: Tue, 22 Mar 2022 09:37:17 +0100
+Subject: [PATCH] meson: fix gpg version check for recent gnupg
+
+Signed-off-by: Marc-Antoine Perennou 
+---
+ meson.build | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e3242323..12ce3d56 100644
+--- a/meson.build
 b/meson.build
+@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', 
required: get_option('pgp-
+ 
+ if get_option('pgp-support')
+   gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), 
accepted_gpg_versions ])
+-  gpg_version = gpg_version_check.stdout()
++  # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft
++  gpg_version_raw = gpg_version_check.stdout()
++  gpg_version_raw_split = gpg_version_raw.split('-')
++  gpg_version = gpg_version_raw_split[0]
+   message('GnuPG Version: @0@'.format(gpg_version))
+   if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0
+ error('Incompatible version of GnuPG. Accepted versions are: 
@0@'.format(accepted_gpg_versions))
+-- 
+2.35.1
+

diff --git a/app-crypt/seahorse/seahorse-41.0-r1.ebuild 
b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
index 8c62df24e60c..dbc4ba04ba9d 100644
--- a/app-crypt/seahorse/seahorse-41.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
+)
+
 src_prepare() {
default
vala_src_prepare

[gentoo-commits] repo/gentoo:master commit in: app-crypt/seahorse/, app-crypt/seahorse/files/

2016-06-24 Thread Pacho Ramos 
commit: c35433e313074f5c6e938da69ae2fc9d3b86981a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jun 24 19:54:38 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jun 24 20:06:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35433e3

app-crypt/seahorse: Drop old

Package-Manager: portage-2.3.0_rc1

 app-crypt/seahorse/Manifest|   1 -
 .../files/seahorse-3.16.0-gnupg-detection.patch| 173 -
 app-crypt/seahorse/seahorse-3.16.0-r1.ebuild   |  71 -
 3 files changed, 245 deletions(-)

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 6c6c554..05293b4 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,2 +1 @@
-DIST seahorse-3.16.0.tar.xz 1496188 SHA256 
770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131 SHA512 
54e020e907c0053762bf78fd1b4a47ed30d253a89d9063f6daa33598fc3cd97dca0af0cd66bb4a140223b6ae18db88a52bfc50f46987cb3a8d0351c115fba923
 WHIRLPOOL 
5e3c3ee17be55849c22019c7a9669380ae101e39d9c81e66d6140d500ef3882c2019f39491bfb37a9019c3fda78304aab9743dc3ae112646a4e9106493704372
 DIST seahorse-3.18.0.tar.xz 1555384 SHA256 
530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667 SHA512 
76475645d1f94a99bf12c3bbbd840526ab3f1da9c6dd7c8c7fca1cca1cdb22692c44d6107ed1f0192dacb6990c1bbc5c1e0bb9a412132fbf18b302d6059cb254
 WHIRLPOOL 
a470024c7c187f854f7458de31ce8aae6f27ff99ee44d872c2298983391e3f39a2c22e5c201927a5b303ced1a614de9729af9625b59714b6cd580890714e5b79

diff --git a/app-crypt/seahorse/files/seahorse-3.16.0-gnupg-detection.patch 
b/app-crypt/seahorse/files/seahorse-3.16.0-gnupg-detection.patch
deleted file mode 100644
index 63004af..000
--- a/app-crypt/seahorse/files/seahorse-3.16.0-gnupg-detection.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From dfabc8de30e87fd7b6dc6d12f34fa29858caed95 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor 
-Date: Fri, 5 Jun 2015 16:01:43 -0400
-Subject: Avoid binding seahorse to the build-time version of gpg
-
-As a user of gpgme, seahorse should prefer gpg2 over gpg, since gpgme
-is more fully-functional when it works with gpg2.
-
-Moreover, seahorse should not assume that the version of gpg that it
-was built against is the same version of gpg that it is running
-against.
-
-GPGME has allowed a NULL value for the file_name parameter for
-gpgme_set_engine_info ever since the function appeared.  This will use
-gpgme's default engine selection, which is likely to be better than
-hardcoding the path that seahorse found during compile time.
-
-Moreover, seahorse should not bother trying to build against archaic
-versions of these branches, and certainly shouldn't hardcode numeric
-values that only worked for old versions in the seahorse headers.
-
-This changeset adjusts the configure.ac tests to make sure that the
-build environment has a non-archaic version of gnupg at least.
-
-Signed-off-by: Stef Walter 
- * Remove support for GnuPG 1.4.x as discussed at linked bug
-
-https://bugzilla.gnome.org/show_bug.cgi?id=750468
-
-diff --git a/configure.ac b/configure.ac
-index 760ec98..bf34ea9 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,7 @@ GCR_REQUIRED=3.11.91
- GTK_REQ=3.4.0
- GTK_MAX=GTK_VERSION_3_4
- 
--GNUPG_ACCEPTED="1.2 1.4 2.0"
-+GNUPG_ACCEPTED="2.0.12 2.1.4"
- GPGME_REQUIRED=1.0.0
- LIBSECRET_REQUIRED=0.16
- AVAHI_GLIB_REQUIRED=0.6
-@@ -130,7 +130,7 @@ else
-   DO_CHECK=$enableval, DO_CHECK=yes)
-   
-   if test "$DO_CHECK" = "yes"; then
--  AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
-+  AC_PATH_PROGS(GNUPG, [gpg2 gpg], no)
-   AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
-   ok="no"
-   if test "$GNUPG" != "no"; then
-@@ -144,12 +144,16 @@ else
-   sed 's/^gpg (GnuPG) 
\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
- 
-   for ver in $GNUPG_ACCEPTED; do
--  if test "$ver" = "$major.$minor"; then
--  AC_DEFINE_UNQUOTED(GPG_MAJOR, [$major], 
[GPG Major Version])
--  AC_DEFINE_UNQUOTED(GPG_MINOR, [$minor], 
[GPG Minor Version])
--  AC_DEFINE_UNQUOTED(GPG_MICRO, [$micro], 
[GPG Micro Version])
--  ok="yes"
--  break
-+  branch=`echo $ver | sed 's/\.[[0-9]]*$//'`
-+  if test "$branch" = "$major.$minor"; then
-+  min_micro=`echo $ver | sed 
's/^[[0-9]]*\.[[0-9]]*\.//'`
-+  if test "$min_micro" -le "$micro"; then
-+  AC_DEFINE_UNQUOTED(GPG_MAJOR, 
[$major], [GPG Major Version])
-+