[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-37-ga4eea56

[jonathan at claws-mail.org]

The branch, master has been updated
       via  a4eea560763401b524ca8b2976c56a6a59b638b7 (commit)
      from  176c1d48c0eb28cbea4be7240f3818c36b939299 (commit)

Summary of changes:
 packages/packages.current                          |  2 +-
 patches/gpgme/01-gpg-error-m4.patch                | 54 ++++++++++++++++++++++
 .../{ytnef/99-autotools.sh => gpgme/99-autogen.sh} |  2 +-
 src/Makefile.am                                    |  2 +-
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 patches/gpgme/01-gpg-error-m4.patch
 copy patches/{ytnef/99-autotools.sh => gpgme/99-autogen.sh} (56%)


- Log -----------------------------------------------------------------
commit a4eea560763401b524ca8b2976c56a6a59b638b7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Aug 20 20:48:31 2022 -0700

    Update to gpgme-1.18.0

diff --git a/packages/packages.current b/packages/packages.current
index 0ee7031..df1473c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -21,7 +21,7 @@ glib,2.72.3,file,https://download.gnome.org/sources/glib/2.72/glib-2.72.3.tar.xz
 glib_networking,2.72.2,file,https://download.gnome.org/sources/glib-networking/2.72/glib-networking-2.72.2.tar.xz,cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268,,
 gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
 gnutls,3.7.7,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.7.tar.xz,be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106,,
-gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
+gpgme,1.18.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.18.0.tar.bz2,361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e,,
 gtk,3.24.34,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.34.tar.xz,dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec,,
 gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
 harfbuzz,4.4.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.4.1/harfbuzz-4.4.1.tar.xz,c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee,,
diff --git a/patches/gpgme/01-gpg-error-m4.patch b/patches/gpgme/01-gpg-error-m4.patch
new file mode 100644
index 0000000..3663b79
--- /dev/null
+++ b/patches/gpgme/01-gpg-error-m4.patch
@@ -0,0 +1,54 @@
+From 628cb1a786bd5d420be17c2e9ffd407f4fbf517e Mon Sep 17 00:00:00 2001
+From: Damien Goutte-Gattat <dgouttegattat at incenp.org>
+Date: Tue, 20 Sep 2022 22:28:34 +0100
+Subject: [PATCH] m4: Fix detection of gpgrt's libdir.
+
+* src/gpg-error.m4 (GPGRT_CONFIG): Handle the case where none of the
+system lib directories contain a pkgconfig subdirectory.
+--
+
+When we look for gpgrt_libdir, there's a corner case if we had been able
+to obtain system libdirs (using `cc -print-search-dirs`) *but* none of
+those system libdirs happen to contain a valid pkgconfig subdirectory
+(which may be unlikely but can and does happen when cross-compiling).
+
+We do test for the case where we have not obtained any system libdir at
+all, in which case we fallback to `${gpgrt_prefix}/lib`
+(`possible_libdir1`), but we do not test if the list of libdir
+candidates is reduced to nothing after we have eliminated all the
+libdirs that do not contain a pkgconfig subdirectory.
+
+This patch adds a test for this precise case.
+
+Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>
+---
+ src/gpg-error.m4 | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
+index 4b5cd40..a975e53 100644
+--- a/m4/gpg-error.m4
++++ b/m4/gpg-error.m4
+@@ -10,7 +10,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ #
+-# Last-changed: 2022-02-15
++# Last-changed: 2022-09-21
+ 
+ 
+ dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
+@@ -120,6 +120,10 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+         fi
+         if test -n "$gpgrt_libdir"; then break; fi
+       done
++      if test -z "$libdir_candidates"; then
++        # No valid pkgconfig dir in any of the system directories, fallback
++        gpgrt_libdir=${possible_libdir1}
++      fi
+     else
+       # When we cannot determine system libdir-format, use this:
+       gpgrt_libdir=${possible_libdir1}
+-- 
+2.11.0
+
diff --git a/patches/gpgme/99-autogen.sh b/patches/gpgme/99-autogen.sh
new file mode 100755
index 0000000..a430a4e
--- /dev/null
+++ b/patches/gpgme/99-autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./autogen.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 0705ad1..40bd049 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,7 +212,7 @@ cm_pkg_gpgme_configure = \
 	--disable-gpg-test \
 	--disable-gpgsm-test \
 	--disable-g13-test \
-	--with-libassuan-prefix=$(idir) \
+	GPGRT_CONFIG=$(SYSROOT)/bin/gpgrt-config \
 	LDFLAGS=-L$(idir)/lib
 
 cm_pkg_gnutls_configure = \

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port