[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-71-gb8bcbea

jonathan at claws-mail.org jonathan at claws-mail.org
Sun Oct 8 05:29:09 UTC 2023


The branch, master has been updated
       via  b8bcbeae43d6b4dad95d6895022ac50e3a3a0852 (commit)
      from  3853b5e50e4ad3fad85dc9ccc873b600dac8e7d7 (commit)

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


- Log -----------------------------------------------------------------
commit b8bcbeae43d6b4dad95d6895022ac50e3a3a0852
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sat Oct 7 14:59:37 2023 -0700

    Update to poppler-23.10.0

diff --git a/configure.ac b/configure.ac
index ed1ebd8..7531aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ CM_MPKG([bzip2])
 CM_MPKG([zlib])
 CM_MPKG([poppler_data])
 
-CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng zlib])
+CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gpgme gtk icu4c jpeg libiconv libpng zlib])
 
 CM_SPKG([gmp])
 CM_SPKG([regex], [gettext])
diff --git a/packages/packages.current b/packages/packages.current
index 7427fc6..9602102 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.25.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.25.0
 pango,1.50.14,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.14.tar.xz,1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8,,
 pcre2,10.42,file,https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2,8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840,,
 pixman,0.42.2,file,https://cairographics.org/releases/pixman-0.42.2.tar.gz,ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e,,
-poppler,23.06.0,file,https://poppler.freedesktop.org/poppler-23.06.0.tar.xz,d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65,,
+poppler,23.10.0,file,https://poppler.freedesktop.org/poppler-23.10.0.tar.xz,31a3dfdea79f4922402d313737415a44d44dc14d6b317f959a77c5bba0647dd9,,
 poppler_data,0.4.12,file,https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz,c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74,,
 regex,20230218,git,git://git.savannah.gnu.org/gnulib.git,4d32807ecde3e67b86cbc6018f1edc4debe3306f7c4622698628e2580b752805,master,bb3fd10e6309f017618a12b2c10d3bfb813bfc08
 sqlite,3.42.0,file,https://sqlite.org/2023/sqlite-autoconf-3420000.tar.gz,7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6,,
diff --git a/src/Makefile.am b/src/Makefile.am
index ab1242d..af2a83d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -405,6 +405,9 @@ cm_pkg_poppler_configure = \
 	-DENABLE_QT6=OFF \
 	-DENABLE_LIBCURL=OFF \
 	-DENABLE_LIBOPENJPEG=none \
+	-DENABLE_NSS3=OFF \
+	-DENABLE_LIBTIFF=OFF \
+	-DENABLE_LCMS=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 aa75431..63dd0ec 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -526,7 +526,7 @@ File ${prefix}/bin/libgumbo-1.dll
 ### poppler
 !insertmacro SetPrefix poppler
 File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-129.dll
+File ${prefix}/bin/libpoppler-132.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 6316cba..c1ceb4c 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-129.dll"
+Delete "$INSTDIR\libpoppler-132.dll"
 
 #######################################
 ### gumbo-parser

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


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


More information about the Commits mailing list