[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-47-gff5bb05

[jonathan at claws-mail.org]

The branch, master has been updated
       via  ff5bb057b68eb207deeb734d1ffd1c44edece4c5 (commit)
      from  a9c7fe36e3a5dcab0ff6dd3bbafac4c7062d055f (commit)

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


- Log -----------------------------------------------------------------
commit ff5bb057b68eb207deeb734d1ffd1c44edece4c5
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 11 01:18:51 2023 -0700

    Update to poppler-23.06.0

diff --git a/packages/packages.current b/packages/packages.current
index bfbbe99..039cb80 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1
 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.03.0,file,https://poppler.freedesktop.org/poppler-23.03.0.tar.xz,b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4,,
+poppler,23.06.0,file,https://poppler.freedesktop.org/poppler-23.06.0.tar.xz,d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65,,
 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.41.1,file,https://sqlite.org/2023/sqlite-autoconf-3410100.tar.gz,4dadfbeab9f8e16c695d4fbbc51c16b2f77fb97ff4c1c3d139919dfc038c9e33,,
diff --git a/patches/poppler/02-jpeg-include-order.patch b/patches/poppler/02-jpeg-include-order.patch
index 111a403..9495b42 100644
--- a/patches/poppler/02-jpeg-include-order.patch
+++ b/patches/poppler/02-jpeg-include-order.patch
@@ -1,29 +1,33 @@
---- 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 @@
+--- a/poppler/ImageEmbeddingUtils.cc	2023-06-11 01:57:00.451982903 -0700
++++ b/poppler/ImageEmbeddingUtils.cc	2023-06-11 01:57:25.860309656 -0700
+@@ -14,6 +14,15 @@
  #include <config.h>
  
  #include <memory>
--#ifdef ENABLE_LIBJPEG
--extern "C" {
--#    include <jpeglib.h>
--}
--#    include <csetjmp>
--#endif
- #ifdef ENABLE_LIBPNG
++
++#include "ImageEmbeddingUtils.h"
++#include "goo/gmem.h"
++#include "goo/GooCheckedOps.h"
++#include "Object.h"
++#include "Array.h"
++#include "Error.h"
++#include "PDFDoc.h"
++
+ #ifdef ENABLE_LIBJPEG
+ #    include <cstdio>
+ extern "C" {
+@@ -25,14 +34,6 @@
  #    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
-+
+-#include "ImageEmbeddingUtils.h"
+-#include "goo/gmem.h"
+-#include "goo/GooCheckedOps.h"
+-#include "Object.h"
+-#include "Array.h"
+-#include "Error.h"
+-#include "PDFDoc.h"
+-
  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 a5b36e7..aa75431 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -429,6 +429,7 @@ File ${prefix}/bin/libxslt-1.dll
 ### gpgme
 !insertmacro SetPrefix gpgme
 File ${prefix}/bin/libgpgme-11.dll
+File ${prefix}/bin/libgpgmepp-6.dll
 File ${prefix}/bin/libgpgme-glib-11.dll
 File ${prefix}/libexec/gpgme-w32spawn.exe
 
@@ -525,7 +526,7 @@ File ${prefix}/bin/libgumbo-1.dll
 ### poppler
 !insertmacro SetPrefix poppler
 File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-126.dll
+File ${prefix}/bin/libpoppler-129.dll
 
 #######################################
 ### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index b6e9d42..6316cba 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-126.dll"
+Delete "$INSTDIR\libpoppler-129.dll"
 
 #######################################
 ### gumbo-parser
@@ -103,6 +103,7 @@ Delete "$INSTDIR\libepoxy-0.dll"
 
 ### gpgme
 Delete /REBOOTOK "$INSTDIR\libgpgme-11.dll"
+Delete /REBOOTOK "$INSTDIR\libgpgmepp-6.dll"
 Delete /REBOOTOK "$INSTDIR\libgpgme-glib-11.dll"
 Delete "$INSTDIR\gpgme-w32spawn.exe"
 

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


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