[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-42-gaacb99d

[jonathan at claws-mail.org]

The branch, master has been updated
       via  aacb99d591edf47b06d29b0fe5346efc2052699f (commit)
      from  a2170ad63c99578984070e71d8703007761ec828 (commit)

Summary of changes:
 packages/packages.current                   |  2 +-
 patches/poppler/02-jpeg-include-order.patch | 29 +++++++++++++++++++++++++++++
 src/sections-installer.nsi                  |  2 +-
 src/sections-uninstaller.nsi                |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 patches/poppler/02-jpeg-include-order.patch


- Log -----------------------------------------------------------------
commit aacb99d591edf47b06d29b0fe5346efc2052699f
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Wed Jan 5 11:05:58 2022 -0700

    update to poppler-22.01.0

diff --git a/packages/packages.current b/packages/packages.current
index 404c262..e1383cd 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.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
 pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
+poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
 poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
 regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
 sqlite,3.37.1,file,https://sqlite.org/2021/sqlite-autoconf-3370100.tar.gz,40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e,,
diff --git a/patches/poppler/02-jpeg-include-order.patch b/patches/poppler/02-jpeg-include-order.patch
new file mode 100644
index 0000000..111a403
--- /dev/null
+++ b/patches/poppler/02-jpeg-include-order.patch
@@ -0,0 +1,29 @@
+--- a/poppler/ImageEmbeddingUtils.cc	2022-01-05 05:53:41.000000000 -0700
++++ b/poppler/ImageEmbeddingUtils.cc	2022-01-05 10:53:20.286543287 -0700
+@@ -13,12 +13,6 @@
+ #include <config.h>
+ 
+ #include <memory>
+-#ifdef ENABLE_LIBJPEG
+-extern "C" {
+-#    include <jpeglib.h>
+-}
+-#    include <csetjmp>
+-#endif
+ #ifdef ENABLE_LIBPNG
+ #    include <png.h>
+ #endif
+@@ -31,6 +25,13 @@
+ #include "Error.h"
+ #include "PDFDoc.h"
+ 
++#ifdef ENABLE_LIBJPEG
++extern "C" {
++#    include <jpeglib.h>
++}
++#    include <csetjmp>
++#endif
++
+ namespace ImageEmbeddingUtils {
+ 
+ static const uint8_t PNG_MAGIC_NUM[] = { 0x89, 0x50, 0x4e, 0x47 };
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index aa49afc..7772ef2 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-115.dll
+File ${prefix}/bin/libpoppler-117.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index e71d226..619872d 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-115.dll"
+Delete "$INSTDIR\libpoppler-117.dll"
 
 #######################################
 ### gumbo-parser

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


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