[packages/seahorse-nautilus] - added patch for gpgme 2.0.x, release 2
qboosh
qboosh at pld-linux.org
Sun Aug 10 09:07:11 CEST 2025
commit 5ae093c2792edb7e7e37f1ef75627f4d4bfc473b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Aug 10 09:09:32 2025 +0200
- added patch for gpgme 2.0.x, release 2
seahorse-nautilus-gpgme2.patch | 38 ++++++++++++++++++++++++++++++++++++++
seahorse-nautilus.spec | 12 +++++++++++-
2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/seahorse-nautilus.spec b/seahorse-nautilus.spec
index 519c35c..ef54d4c 100644
--- a/seahorse-nautilus.spec
+++ b/seahorse-nautilus.spec
@@ -2,12 +2,15 @@ Summary: PGP encryption and signing for Nautilus
Summary(pl.UTF-8): Rozszerzenie Seahorse dla Nautilusa
Name: seahorse-nautilus
Version: 3.10.1
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0: https://download.gnome.org/sources/seahorse-nautilus/3.10/%{name}-%{version}.tar.xz
# Source0-md5: 1f33cf9f56ac46b2a2363d022ea7969f
+Patch0: %{name}-gpgme2.patch
URL: https://wiki.gnome.org/Apps/Seahorse
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
BuildRequires: dbus-glib-devel >= 0.35
BuildRequires: desktop-file-utils
BuildRequires: gcr-devel >= 3.4.1
@@ -20,6 +23,7 @@ BuildRequires: intltool >= 0.35.0
BuildRequires: libcryptui-devel >= 3.10
BuildRequires: libgnome-keyring-devel
BuildRequires: libnotify-devel >= 0.3
+BuildRequires: libtool
BuildRequires: nautilus3-devel >= 3.0
BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
@@ -44,8 +48,14 @@ Rozszerzenie do podpisywania i szyfrowania plików.
%prep
%setup -q
+%patch -P0 -p1
%build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--disable-gpg-check \
--disable-silent-rules
diff --git a/seahorse-nautilus-gpgme2.patch b/seahorse-nautilus-gpgme2.patch
new file mode 100644
index 0000000..610b525
--- /dev/null
+++ b/seahorse-nautilus-gpgme2.patch
@@ -0,0 +1,38 @@
+--- seahorse-nautilus-3.10.1/configure.ac.orig 2013-10-17 08:26:32.000000000 +0200
++++ seahorse-nautilus-3.10.1/configure.ac 2025-08-10 08:38:10.515327224 +0200
+@@ -90,7 +90,13 @@ fi
+ ok="no"
+ min_gpgme_version=1.0.0
+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed")
+-if test $GPGME_CONFIG != "failed" ; then
++if test "$GPGME_CONFIG" = "failed" ; then
++ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, "failed")
++ if test $GPGRT_CONFIG != "failed" ; then
++ GPGME_CONFIG="gpgrt-config gpgme"
++ fi
++fi
++if test "$GPGME_CONFIG" != "failed" ; then
+ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+@@ -112,6 +118,8 @@ if test $GPGME_CONFIG != "failed" ; then
+ ok="yes"
+ fi
+ fi
++ elif test "$major" -gt "$req_major"; then
++ ok="yes"
+ fi
+ fi
+
+--- seahorse-nautilus-3.10.1/tool/seahorse-pgp-operation.c.orig 2011-10-24 09:25:37.000000000 +0200
++++ seahorse-nautilus-3.10.1/tool/seahorse-pgp-operation.c 2025-08-10 08:54:43.107920952 +0200
+@@ -303,7 +303,9 @@ event_cb (void *data, gpgme_event_io_t t
+ break;
+
+ case GPGME_EVENT_NEXT_KEY:
++#if GPGME_VERSION_NUMBER < 0x020000
+ case GPGME_EVENT_NEXT_TRUSTITEM:
++#endif
+ default:
+ /* Ignore unsupported event types */
+ break;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/seahorse-nautilus.git/commitdiff/5ae093c2792edb7e7e37f1ef75627f4d4bfc473b
More information about the pld-cvs-commit
mailing list