[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-75-g6783299

[jonathan at claws-mail.org]

The branch, master has been updated
       via  6783299bda32c658572702cf0f45f263dd1f3ace (commit)
      from  32d7366001b9b0377834c9af311124950ab5ecf0 (commit)

Summary of changes:
 packages/packages.current               |  2 +-
 patches/libassuan/01-gpg-error-m4.patch | 54 ---------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 patches/libassuan/01-gpg-error-m4.patch


- Log -----------------------------------------------------------------
commit 6783299bda32c658572702cf0f45f263dd1f3ace
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Nov 5 21:36:49 2022 -0700

    Update to libassuan git head

diff --git a/packages/packages.current b/packages/packages.current
index 4273697..819be3b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -28,7 +28,7 @@ harfbuzz,5.3.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/5.3.1
 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-34-gdf6aec5,git,git://git.gnupg.org/libassuan.git,de59091ea2524218a3ab1220376c63e85717dfca148ef0721d5e42f98e866273,master,df6aec566ce450e4e0702e4784569642f2bc6703
+libassuan,2.5.5-41-g870fdcf,git,git://git.gnupg.org/libassuan.git,9f9a9d9ecf1fc4bdc2ae3e4f44f726897a047bb6c19540f1039e673fc381481f,master,870fdcf92e5991c0bb2e349a951aa8dd93b0e22f
 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.4,file,https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz,d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676,,
diff --git a/patches/libassuan/01-gpg-error-m4.patch b/patches/libassuan/01-gpg-error-m4.patch
deleted file mode 100644
index 3663b79..0000000
--- a/patches/libassuan/01-gpg-error-m4.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
-

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


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