[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-60-g0819260

[jonathan at claws-mail.org]

The branch, master has been updated
       via  0819260b5c55928e70e0ab610ba084779cfea965 (commit)
      from  885219447bbf43c49bc8824f4cc5b982f767c8a9 (commit)

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


- Log -----------------------------------------------------------------
commit 0819260b5c55928e70e0ab610ba084779cfea965
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Fri Mar 4 18:39:26 2022 -0700

    update to poppler-22.03.0

diff --git a/packages/packages.current b/packages/packages.current
index ce69b51..771d34c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -43,7 +43,7 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
 nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
 pango,1.50.4,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.4.tar.xz,f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162,,
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,22.02.0,file,https://poppler.freedesktop.org/poppler-22.02.0.tar.xz,e390c8b806f6c9f0e35c8462033e0a738bb2460ebd660bdb8b6dca01556193e1,,
+poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
 poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
 regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
 sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 7109171..bf2c9ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -389,8 +389,8 @@ cm_pkg_poppler_configure = \
 	-DENABLE_QT6=OFF \
 	-DENABLE_LIBCURL=OFF \
 	-DENABLE_LIBOPENJPEG=none \
-	-DCMAKE_C_FLAGS="$(CM_CFLAGS)" \
-	-DCMAKE_CXX_FLAGS="$(CM_CXXFLAGS) -fexceptions"
+	-DCMAKE_C_FLAGS="-I$(idir)/include $(CM_CFLAGS)" \
+	-DCMAKE_CXX_FLAGS="-I$(idir)/include $(CM_CXXFLAGS) -fexceptions"
 
 cm_pkg_gumbo_parser_configure = \
 	LDFLAGS=-L$(idir)/lib \
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index d76ea8a..333885d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -388,7 +388,7 @@ File ${prefix}/bin/libgumbo-1.dll
 ### poppler
 !insertmacro SetPrefix poppler
 File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-118.dll
+File ${prefix}/bin/libpoppler-119.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index b3dcbcf..c397c4d 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
 #######################################
 ### poppler
 Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-118.dll"
+Delete "$INSTDIR\libpoppler-119.dll"
 
 #######################################
 ### gumbo-parser

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


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