From de166ec3ea12cd416a9e8f1b33e819aeb6da3c0e Mon Sep 17 00:00:00 2001
From: Peter Zhigalov <peter.zhigalov@gmail.com>
Date: Sat, 17 Feb 2024 02:55:55 +0700
Subject: [PATCH] Update enchant, libxml2, libffi, expat, libpcre2, glib, pango

---
 build_sylpheed_macos.sh                       |  4 +--
 enchant/enchant.m                             |  2 +-
 modulesets/bootstrap.modules                  | 14 ++++-----
 ...remove-error-on-build-for-macos-11.0.patch | 31 -------------------
 4 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 patches/0001-PCRE2-remove-error-on-build-for-macos-11.0.patch

diff --git a/build_sylpheed_macos.sh b/build_sylpheed_macos.sh
index dbfc970..af4aecf 100755
--- a/build_sylpheed_macos.sh
+++ b/build_sylpheed_macos.sh
@@ -52,7 +52,7 @@ EOF
 
 mkdir -p "${HOME}/gtk/inst/lib/pkgconfig" "${HOME}/gtk/inst/include/enchant-2"
 cp -a "${SOURCE_DIR}/enchant/enchant.h" "${HOME}/gtk/inst/include/enchant-2/"
-clang "${SOURCE_DIR}/enchant/enchant.m" -O3 -DNDEBUG -dynamiclib -fPIC -current_version 9.5.0 -compatibility_version 9.0.0 \
+clang "${SOURCE_DIR}/enchant/enchant.m" -O3 -DNDEBUG -dynamiclib -fPIC -current_version 9.7.0 -compatibility_version 9.0.0 \
     -mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch arm64 -framework AppKit -framework Foundation \
     -Weverything -Wno-gnu-zero-variadic-macro-arguments -Wno-documentation-unknown-command -Wno-poison-system-directories \
     -Wno-declaration-after-statement \
@@ -170,7 +170,7 @@ EOF
 
 mkdir -p "${HOME}/gtk/inst/lib/pkgconfig" "${HOME}/gtk/inst/include/enchant-2"
 cp -a "${SOURCE_DIR}/enchant/enchant.h" "${HOME}/gtk/inst/include/enchant-2/"
-clang "${SOURCE_DIR}/enchant/enchant.m" -O3 -DNDEBUG -dynamiclib -fPIC -current_version 9.5.0 -compatibility_version 9.0.0 \
+clang "${SOURCE_DIR}/enchant/enchant.m" -O3 -DNDEBUG -dynamiclib -fPIC -current_version 9.7.0 -compatibility_version 9.0.0 \
     -mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch x86_64 -framework AppKit -framework Foundation \
     -Weverything -Wno-gnu-zero-variadic-macro-arguments -Wno-documentation-unknown-command -Wno-poison-system-directories \
     -Wno-declaration-after-statement \
diff --git a/enchant/enchant.m b/enchant/enchant.m
index 46aeb46..a426cf5 100644
--- a/enchant/enchant.m
+++ b/enchant/enchant.m
@@ -1,7 +1,7 @@
 /*
 clang enchant.m -O3 \
     -dynamiclib -fPIC \
-    -current_version 9.5.0 \
+    -current_version 9.7.0 \
     -compatibility_version 9.0.0 \
     -mmacos-version-min=10.9 \
     -framework AppKit \
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index 4f5dce7..172aa0e 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -113,7 +113,7 @@
 
   <!-- https://download.gnome.org/sources/libxml2/ -->
   <autotools id="libxml2" autogen-sh="configure" autogenargs="--disable-static">
-    <branch module="libxml2/2.12/libxml2-${version}.tar.xz" version="2.12.4"/>
+    <branch module="libxml2/2.12/libxml2-${version}.tar.xz" version="2.12.5"/>
     <after>
       <dep package="xz"/>
     </after>
@@ -130,7 +130,7 @@
   <!-- https://github.com/libffi/libffi/releases/ -->
   <!-- disable-multi-os-directory: see https://sourceware.org/ml/libffi-discuss/2014/msg00078.html -->
   <autotools id="libffi" autogen-sh="configure" autogenargs="--disable-multi-os-directory --disable-builddir --disable-static">
-    <branch repo="github-tarball" module="libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz" version="3.4.4"/>
+    <branch repo="github-tarball" module="libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz" version="3.4.5"/>
   </autotools>
 
   <!-- http://www.libpng.org/pub/png/libpng.html -->
@@ -142,7 +142,7 @@
 
   <!-- https://github.com/libexpat/libexpat/releases/ -->
   <autotools id="expat" autogen-sh="configure" autogenargs="--without-examples --without-tests --without-docbook --disable-static">
-    <branch repo="github-tarball" module="libexpat/libexpat/releases/download/R_2_5_0/expat-${version}.tar.bz2" version="2.5.0"/>
+    <branch repo="github-tarball" module="libexpat/libexpat/releases/download/R_2_6_0/expat-${version}.tar.bz2" version="2.6.0"/>
   </autotools>
 
   <!-- https://www.cairographics.org/releases/ -->
@@ -209,14 +209,12 @@
 
   <!-- https://github.com/PCRE2Project/pcre2/releases/ -->
   <autotools id="libpcre2" autogen-sh="configure" autogenargs="--enable-unicode --enable-pcre2-16 --enable-pcre2-32 --enable-newline-is-any --enable-jit --disable-static">
-    <branch repo="github-tarball" module="PCRE2Project/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2" version="10.42">
-      <patch file="0001-PCRE2-remove-error-on-build-for-macos-11.0.patch" strip="1"/>
-    </branch>
+    <branch repo="github-tarball" module="PCRE2Project/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2" version="10.43"/>
   </autotools>
 
   <!-- https://download.gnome.org/sources/glib/ -->
   <meson id="glib" mesonargs="--buildtype=release -Dlibmount=disabled -Dman-pages=disabled -Ddocumentation=false -Dtests=false">
-    <branch module="glib/2.79/glib-${version}.tar.xz" version="2.79.1">
+    <branch module="glib/2.79/glib-${version}.tar.xz" version="2.79.2">
       <patch file="0001-GLIB-disable-utimensat.patch" strip="1"/>
     </branch>
     <dependencies>
@@ -250,7 +248,7 @@
 
   <!-- https://download.gnome.org/sources/pango/ -->
   <meson id="pango" mesonargs="--buildtype=release -Dintrospection=disabled -Dfontconfig=disabled -Dfreetype=disabled">
-    <branch version="1.51.0" module="pango/1.51/pango-${version}.tar.xz"/>
+    <branch version="1.51.2" module="pango/1.51/pango-${version}.tar.xz"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
diff --git a/patches/0001-PCRE2-remove-error-on-build-for-macos-11.0.patch b/patches/0001-PCRE2-remove-error-on-build-for-macos-11.0.patch
deleted file mode 100644
index 7fa3062..0000000
--- a/patches/0001-PCRE2-remove-error-on-build-for-macos-11.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0dfb08db4b77545d730d2c65b6a3b30ccfe8684f Mon Sep 17 00:00:00 2001
-From: Peter Zhigalov <peter.zhigalov@gmail.com>
-Date: Tue, 20 Sep 2022 23:28:42 +0700
-Subject: [PATCH] PCRE2: remove error on build for macos < 11.0
-
----
- src/sljit/sljitExecAllocator.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/sljit/sljitExecAllocator.c b/src/sljit/sljitExecAllocator.c
-index 92d940d..b9d0e33 100644
---- a/src/sljit/sljitExecAllocator.c
-+++ b/src/sljit/sljitExecAllocator.c
-@@ -150,11 +150,9 @@ static SLJIT_INLINE int get_map_jit_flag()
- 
- static SLJIT_INLINE void apple_update_wx_flags(sljit_s32 enable_exec)
- {
--#if MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
--	pthread_jit_write_protect_np(enable_exec);
--#else
--#error "Must target Big Sur or newer"
--#endif /* BigSur */
-+	if (__builtin_available(macOS 11.0, *)) {
-+		pthread_jit_write_protect_np(enable_exec);
-+	}
- }
- #endif /* SLJIT_CONFIG_X86 */
- #else /* !TARGET_OS_OSX */
--- 
-2.37.0 (Apple Git-136)
-