[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-59-g7bca009

Sun Nov 6 06:12:58 UTC 2022

The branch, master has been updated
       via  7bca009e194d6c1225dbf5a4a63c4e4728537248 (commit)
      from  632092b775d1cb4ec15280f516878ff33f293b5c (commit)

Summary of changes:
 packages/packages.current                          | 2 +-
 patches/{gpgme => libassuan}/01-gpg-error-m4.patch | 0
 patches/{gpgme => libassuan}/99-autogen.sh         | 0
 src/Makefile.am                                    | 4 +++-
 4 files changed, 4 insertions(+), 2 deletions(-)
 copy patches/{gpgme => libassuan}/01-gpg-error-m4.patch (100%)
 copy patches/{gpgme => libassuan}/99-autogen.sh (100%)


- Log -----------------------------------------------------------------
commit 7bca009e194d6c1225dbf5a4a63c4e4728537248
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Oct 8 20:59:29 2022 -0700

    Update to libassuan git head
    
    Pull in build changes to fix building with new libgpg-error

diff --git a/packages/packages.current b/packages/packages.current
index d7c13c8..75fbade 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -28,7 +28,7 @@ harfbuzz,5.3.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/5.3.0
 hunspell,1.7.1,file,https://github.com/hunspell/hunspell/releases/download/v1.7.1/hunspell-1.7.1.tar.gz,b2d9c5369c2cc7f321cb5983fda2dbf007dce3d9e17519746840a6f0c4bf7444,,
 icu4c,71.1,file,https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz,67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf,,
 jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
-libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
+libassuan,2.5.5-34-gdf6aec5,git,git://git.gnupg.org/libassuan.git,de59091ea2524218a3ab1220376c63e85717dfca148ef0721d5e42f98e866273,master,df6aec566ce450e4e0702e4784569642f2bc6703
 libepoxy,1.5.10,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.10.tar.xz,072cda4b59dd098bba8c2363a6247299db1fa89411dc221c8b81b8ee8192e623,,
 libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
 libffi,3.4.3,file,https://github.com/libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz,4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8,,
diff --git a/patches/libassuan/01-gpg-error-m4.patch b/patches/libassuan/01-gpg-error-m4.patch
new file mode 100644
index 0000000..3663b79
--- /dev/null
+++ b/patches/libassuan/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/libassuan/99-autogen.sh b/patches/libassuan/99-autogen.sh
new file mode 100755
index 0000000..a430a4e
--- /dev/null
+++ b/patches/libassuan/99-autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./autogen.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 40bd049..f93dc3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,7 +183,9 @@ cm_pkg_libgpg_error_configure = \
 	LDFLAGS=-L$(idir)/lib
 
 cm_pkg_libassuan_configure = \
-	--enable-static
+	--enable-static \
+	--disable-doc \
+	GPGRT_CONFIG=$(SYSROOT)/bin/gpgrt-config
 
 cm_pkg_libpng_configure = \
 	CPPFLAGS=-I$(idir)/include \

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


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