[Commits] [SCM] claws-win32-installer branch, master, updated. 4.2.0-2-13-g7a4b7c3

[jonathan at claws-mail.org]

The branch, master has been updated
       via  7a4b7c3b5180dd07d68c29a41529fb6615a62346 (commit)
      from  1e0690788b0f50cc15787d63adfdde212d249782 (commit)

Summary of changes:
 configure.ac                 | 2 +-
 packages/packages.current    | 2 +-
 src/Makefile.am              | 1 +
 src/sections-installer.nsi   | 2 +-
 src/sections-uninstaller.nsi | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 7a4b7c3b5180dd07d68c29a41529fb6615a62346
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun May 5 19:29:11 2024 -0700

    Update to poppler-24.05.0
    
    Disable GPGME support to fix build failure with std::future

diff --git a/configure.ac b/configure.ac
index 80f86a0..0f21992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,7 @@ CM_SPKG([p11_kit], [gettext libffi libtasn1])
 CM_SPKG([pango], [cairo fontconfig freetype fribidi glib harfbuzz])
 CM_SPKG([pcre2], [zlib])
 CM_SPKG([pixman], [glib libpng])
-CM_SPKG([poppler], [cairo fontconfig freetype gdk_pixbuf glib gpgme gtk icu4c jpeg libiconv libpng poppler_data zlib])
+CM_SPKG([poppler], [cairo fontconfig freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng poppler_data zlib])
 CM_SPKG([regex], [gettext])
 CM_SPKG([ytnef])
 
diff --git a/packages/packages.current b/packages/packages.current
index f96fcc7..5cd1045 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -59,7 +59,7 @@ p11_kit,0.25.3,file,https://github.com/p11-glue/p11-kit/releases/download/0.25.3
 pango,1.52.2,file,https://download.gnome.org/sources/pango/1.52/pango-1.52.2.tar.xz,d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b,,
 pcre2,10.43,file,https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2,e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb,,
 pixman,0.43.4,file,https://cairographics.org/releases/pixman-0.43.4.tar.gz,a0624db90180c7ddb79fc7a9151093dc37c646d8c38d3f232f767cf64b85a226,,
-poppler,24.03.0,file,https://poppler.freedesktop.org/poppler-24.03.0.tar.xz,bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446,,
+poppler,24.05.0,file,https://poppler.freedesktop.org/poppler-24.05.0.tar.xz,d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779,,
 poppler_data,0.4.12,file,https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz,c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74,,
 regex,20240301,git,git://git.savannah.gnu.org/gnulib.git,68b015146e2e5675f23e753bdccd5e61262aa231f325229722edad3f8c24c43a,master,1348f1fd10b8a6e184cb29a0c6f930aff1a4017d
 sqlite,3.45.1,file,https://sqlite.org/2024/sqlite-autoconf-3450100.tar.gz,cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a,,
diff --git a/src/Makefile.am b/src/Makefile.am
index b62e1c5..c7e7483 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -409,6 +409,7 @@ cm_pkg_poppler_configure = \
 	-DENABLE_NSS3=OFF \
 	-DENABLE_LIBTIFF=OFF \
 	-DENABLE_LCMS=OFF \
+	-DENABLE_GPGME=OFF \
 	-DCMAKE_C_FLAGS="-I$(idir)/include $(CM_CFLAGS)" \
 	-DCMAKE_CXX_FLAGS="-I$(idir)/include $(CM_CXXFLAGS) -fexceptions"
 
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 88ec65c..3e859fa 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -526,7 +526,7 @@ File ${prefix}/bin/libgumbo-2.dll
 ### poppler
 !insertmacro SetPrefix poppler
 File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-135.dll
+File ${prefix}/bin/libpoppler-137.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 1496d30..bdbbf5a 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -37,7 +37,7 @@ RMDir "$INSTDIR\lib\claws-mail"
 #######################################
 ### poppler
 Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-135.dll"
+Delete "$INSTDIR\libpoppler-137.dll"
 
 #######################################
 ### gumbo-parser

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


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