[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.1-1-25-gbe44dd2

[jonathan at claws-mail.org]

The branch, master has been updated
       via  be44dd2fea7ee5e86075aa01b0d98982da7258c4 (commit)
      from  4ccebf82ca71d906887854aad4da6296cc1eedf3 (commit)

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


- Log -----------------------------------------------------------------
commit be44dd2fea7ee5e86075aa01b0d98982da7258c4
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Feb 19 22:18:24 2023 -0700

    Update to pcre2-10.42

diff --git a/configure.ac b/configure.ac
index 615d0bd..ed1ebd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,8 +249,8 @@ CM_SPKG([libiconv])
 CM_SPKG([gettext], [libiconv])
 
 CM_SPKG([libffi])
-CM_SPKG([pcre])
-CM_SPKG([glib], [libiconv gettext libffi pcre zlib])
+CM_SPKG([pcre2])
+CM_SPKG([glib], [libiconv gettext libffi pcre2 zlib])
 CM_SPKG([expat])
 CM_SPKG([pixman], [libpng])
 CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
diff --git a/packages/packages.current b/packages/packages.current
index 4020d94..f5fab7e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,7 +45,7 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
 nettle,3.8.1,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.8.1.tar.gz,364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe,,
 p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
 pango,1.50.12,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.12.tar.xz,caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3,,
-pcre,8.45,file,https://versaweb.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
+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.02.0,file,https://poppler.freedesktop.org/poppler-23.02.0.tar.xz,3315dda270fe2b35cf1f41d275948c39652fa863b90de0766f6b293d9a558fc9,,
 poppler_data,0.4.12,file,https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz,c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c017b7..a4e9bcf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,16 +73,9 @@ cm_pkg_regex_configure = \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 
-cm_pkg_pcre_configure = \
-	--disable-shared \
-	--enable-static \
-	--enable-pcre16 \
-	--enable-pcre32 \
-	--disable-cpp \
-	--enable-utf \
-	--enable-unicode-properties \
-	--enable-newline-is-anycrlf \
-	--disable-stack-for-recursion
+cm_pkg_pcre2_configure = \
+	--disable-static \
+	--enable-newline-is-anycrlf
 
 if ENABLE_DEBUG_OPTS
 cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 5766e74..725112e 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -73,6 +73,7 @@
 !define cm_pkg_libpng_version @cm_pkg_libpng_version@
 !define cm_pkg_hunspell_version @cm_pkg_hunspell_version@
 !define cm_pkg_enchant_version @cm_pkg_enchant_version@
+!define cm_pkg_pcre2_version @cm_pkg_pcre2_version@
 !define cm_pkg_glib_version @cm_pkg_glib_version@
 !define cm_pkg_gdk_pixbuf_version @cm_pkg_gdk_pixbuf_version@
 !define cm_pkg_libffi_version @cm_pkg_libffi_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index c8c7597..7f5b053 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -138,6 +138,11 @@ SetOutPath "$INSTDIR"
 !insertmacro SetPrefix libffi
 File ${prefix}/bin/libffi-8.dll
 
+#######################################
+### pcre2
+!insertmacro SetPrefix pcre2
+File ${prefix}/bin/libpcre2-8-0.dll
+
 #######################################
 ### glib
 !insertmacro SetPrefix glib
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index ad70bd4..c18fc7d 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -372,6 +372,10 @@ Delete /REBOOTOK "$INSTDIR\libgio-2.0-0.dll"
 RMDir "$INSTDIR\lib\gio\modules"
 RMDir "$INSTDIR\lib\gio"
 
+#######################################
+### pcre2
+Delete /REBOOTOK "$INSTDIR\libpcre2-8-0.dll"
+
 #######################################
 ### libffi
 Delete /REBOOTOK "$INSTDIR\libffi-8.dll"

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


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