[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-43-g5ba7e3d

jonathan at claws-mail.org jonathan at claws-mail.org
Thu Nov 11 22:39:22 CET 2021


The branch, gtk3 has been updated
       via  5ba7e3d3878be2df5df0b5730f2fa20e87e11c7d (commit)
      from  9eb12c8552527fc1b606f95da24f9dd17a6676b6 (commit)

Summary of changes:
 configure.ac              |  3 ++-
 packages/packages.current |  1 +
 src/Makefile.am           | 13 +++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 5ba7e3d3878be2df5df0b5730f2fa20e87e11c7d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Wed Nov 10 23:16:20 2021 -0700

    add pcre-8.45 for glib-2.70

diff --git a/configure.ac b/configure.ac
index 5095dfe..7e3a4d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,8 @@ CM_SPKG([libiconv])
 CM_SPKG([gettext], [libiconv])
 
 CM_SPKG([libffi])
-CM_SPKG([glib], [libiconv gettext libffi zlib])
+CM_SPKG([pcre])
+CM_SPKG([glib], [libiconv gettext libffi pcre 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 b391e0a..8994332 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,6 +45,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,,
 p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
 pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
+pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
 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_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
diff --git a/src/Makefile.am b/src/Makefile.am
index fab9540..9c9c2f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,8 +72,17 @@ cm_pkg_regex_configure = \
 	CPPFLAGS=-I$(idir)/include \
 	LDFLAGS=-L$(idir)/lib
 
-cm_pkg_glib_configure = \
-	-Dinternal_pcre=true
+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
+
 if ENABLE_DEBUG_OPTS
 cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
 else

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


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


More information about the Commits mailing list