[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-41-g3d69021

[jonathan at claws-mail.org]

The branch, master has been updated
       via  3d69021a5f2980f81cd1c0a93c5200e21ad0e96e (commit)
      from  e7e7be9f54ffd0bbd79e5cad058c4dc182fa5e1b (commit)

Summary of changes:
 packages/packages.current           |  2 +-
 patches/gpgme/01-gpg-error-m4.patch | 54 -------------------------------------
 patches/gpgme/99-autogen.sh         |  3 ---
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 patches/gpgme/01-gpg-error-m4.patch
 delete mode 100755 patches/gpgme/99-autogen.sh


- Log -----------------------------------------------------------------
commit 3d69021a5f2980f81cd1c0a93c5200e21ad0e96e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 11 01:09:37 2023 -0700

    Update to gpgme-1.20.0

diff --git a/packages/packages.current b/packages/packages.current
index ccc5363..ca9f3d0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -21,7 +21,7 @@ glib,2.76.3,file,https://download.gnome.org/sources/glib/2.76/glib-2.76.3.tar.xz
 glib_networking,2.76.0,file,https://download.gnome.org/sources/glib-networking/2.76/glib-networking-2.76.0.tar.xz,149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a,,
 gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
 gnutls,3.7.9,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.9.tar.xz,aaa03416cdbd54eb155187b359e3ec3ed52ec73df4df35a0edd49429ff64d844,,
-gpgme,1.18.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.18.0.tar.bz2,361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e,,
+gpgme,1.20.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.20.0.tar.bz2,25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750,,
 gtk,3.24.37,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.tar.xz,6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57,,
 gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
 harfbuzz,7.1.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/7.1.0/harfbuzz-7.1.0.tar.xz,f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b,,
diff --git a/patches/gpgme/01-gpg-error-m4.patch b/patches/gpgme/01-gpg-error-m4.patch
deleted file mode 100644
index 3663b79..0000000
--- a/patches/gpgme/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
-
diff --git a/patches/gpgme/99-autogen.sh b/patches/gpgme/99-autogen.sh
deleted file mode 100755
index a430a4e..0000000
--- a/patches/gpgme/99-autogen.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./autogen.sh

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


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