[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-117-g63875ef
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Feb 7 03:36:00 UTC 2022
The branch, gtk3 has been updated
via 63875efb0271f0dad8d45fe7c1143fdd7f66bf13 (commit)
from e672eb82a932c40d4d3ef93aa8c95fb9c1fc9f3a (commit)
Summary of changes:
configure.ac | 3 ++-
packages/packages.current | 1 +
patches/libsoup/01-extern-c.patch | 26 ----------------------
.../webkitgtk-2.4.11/09-no-fortify-source.patch | 18 ---------------
patches/webkitgtk-2.4.11/99-autoreconf.sh | 3 ---
src/Makefile.am | 16 ++++++++-----
6 files changed, 14 insertions(+), 53 deletions(-)
delete mode 100644 patches/libsoup/01-extern-c.patch
delete mode 100644 patches/webkitgtk-2.4.11/09-no-fortify-source.patch
delete mode 100755 patches/webkitgtk-2.4.11/99-autoreconf.sh
- Log -----------------------------------------------------------------
commit 63875efb0271f0dad8d45fe7c1143fdd7f66bf13
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 6 19:12:28 2022 -0700
Revert "Merge branch 'master' into gtk3"
This reverts commits 4968b92d8589018fee527968c6059c83e21b5ada and
e672eb82a932c40d4d3ef93aa8c95fb9c1fc9f3a, reversing changes made
to dd397766cfb413dbacc64233980c0fad4facad1c.
diff --git a/configure.ac b/configure.ac
index f1790d5..615d0bd 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 45a80bf..fdd0384 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.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
+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,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,,
diff --git a/patches/libsoup/01-extern-c.patch b/patches/libsoup/01-extern-c.patch
deleted file mode 100644
index 5f5c2ff..0000000
--- a/patches/libsoup/01-extern-c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Revert libsoup commit b5e4f15a09d197b6a9b4b2d78b33779f27d828af
-# old webkitgtk fails to link against libsoup with an undefined reference
-
-diff -u a/libsoup/soup.h b/libsoup/soup.h
---- a/libsoup/soup.h 2021-08-22 15:32:34.238970300 -0700
-+++ b/libsoup/soup.h 2021-09-10 20:44:04.968600007 -0700
-@@ -6,6 +6,10 @@
- #ifndef __SOUP_H__
- #define __SOUP_H__ 1
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #define __SOUP_H_INSIDE__
-
- #include <libsoup/soup-address.h>
-@@ -64,4 +68,8 @@
-
- #undef __SOUP_H_INSIDE__
-
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* __SOUP_H__ */
diff --git a/patches/webkitgtk-2.4.11/09-no-fortify-source.patch b/patches/webkitgtk-2.4.11/09-no-fortify-source.patch
deleted file mode 100644
index d3e3a34..0000000
--- a/patches/webkitgtk-2.4.11/09-no-fortify-source.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Remove -D_FORTIFY_SOURCE=2 for mingw gcc-10
-diff -u a/Source/autotools/SetupCompilerFlags.m4 b/Source/autotools/bSetupCompilerFlags.m4
---- a/Source/autotools/SetupCompilerFlags.m4
-+++ b/Source/autotools/SetupCompilerFlags.m4
-@@ -46,13 +46,6 @@ fi
- if test "$enable_optimizations" = "yes"; then
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
--
-- if test "$c_compiler" = "gcc"; then
-- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-- fi
-- if test "$cxx_compiler" = "g++"; then
-- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
-- fi
- else
- CXXFLAGS="$CXXFLAGS -Og"
- CFLAGS="$CFLAGS -Og"
diff --git a/patches/webkitgtk-2.4.11/99-autoreconf.sh b/patches/webkitgtk-2.4.11/99-autoreconf.sh
deleted file mode 100755
index 1540ea4..0000000
--- a/patches/webkitgtk-2.4.11/99-autoreconf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-autoreconf -fvi
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c467af..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
@@ -328,9 +337,6 @@ cm_pkg_libsoup_configure = \
-Dsysprof=disabled \
-Dtls_check=false \
-Dintrospection=disabled
-# -fcommon works around libsoup failing to link with GCC 10 due to multiple
-# definition errors
-cm_pkg_libsoup_cflags = $(CM_CFLAGS) -fcommon
cm_pkg_libsoup_meson_cppflags = -I$(idir)/include
cm_pkg_libsoup_meson_ldflags = -L$(idir)/lib
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list