gentoo auto-resync : 25:03:2024 - 13:01:08

3 files changed, 48 insertions, 1 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 8511fb94c46b..de258f2f3b6e 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,9 +1,10 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 AUX glib-2.78.4-distutils.patch 933 BLAKE2B a5416e699a8604a5f443339401bdfcc50e6631eeac82a1d4e169f450b7c15b0323d75fa337ab689a029699cf3190310539cf5f603f2262963aea8ee1d1c9b5a0 SHA512 e5cfdfa795671f2a302b0bded516086e03056ee2675df9343819efc97130fb66988bdd67341fa9678b443c750f98d3902efe87c8f7e7532babd314414d93d0d0
+AUX glib-2.78.4-libpcre2-10.43.patch 1742 BLAKE2B 4fa283d28780e8376e99306bebd92162d00bd5b4040cf6c090a56f77393830a3a5c8fbbdc82a0f69b5b8bb78e0e1f4fe5ce23eaca2b1c82e2881cec416fed742 SHA512 7915c26ba0c313178148d2b85920943e7270f2ee2828800b8dc69c0baaf101b7a2a94341f42c870d5c770933063221d97dcdc655d8c03d0285f85d6b2b67f109
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246
 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 EBUILD glib-2.76.4.ebuild 10851 BLAKE2B 1b3c64cdcacfcb383432deca7866d6e6faf2841b282d50c4e4574b77dcba243b811daf50a366ad62f6d2b0a9cb39a009bde4ce6c8cbaab82b3c3b91393c5d481 SHA512 b6c4d2df93a86164bb01cc3fb28da400594e4d35608fc9c70281bb06b3ad8ac5fce9f445bea56fef86ee59d89846f806667c3d63dbefe84707ab547e9267a96c
 EBUILD glib-2.78.3.ebuild 10851 BLAKE2B 1b3c64cdcacfcb383432deca7866d6e6faf2841b282d50c4e4574b77dcba243b811daf50a366ad62f6d2b0a9cb39a009bde4ce6c8cbaab82b3c3b91393c5d481 SHA512 b6c4d2df93a86164bb01cc3fb28da400594e4d35608fc9c70281bb06b3ad8ac5fce9f445bea56fef86ee59d89846f806667c3d63dbefe84707ab547e9267a96c
-EBUILD glib-2.78.4-r1.ebuild 11058 BLAKE2B 2d3cb4ebd208f6c91ceabfa0c7d1df46f9d6082bfc68c19b73c572c9f440f018fb4dd2c8b134c68e1e89155a283a81e0cf76e317e14ad66f38b7394115d28eba SHA512 281b413dcd954042fd540d22f3f8b0e6b44e2c9758760f60902df2939e2aae75742787538260ed33fad94b1dde73b127aabbb56f3278c9848e73bf5e2ae3bba0
+EBUILD glib-2.78.4-r1.ebuild 11107 BLAKE2B 5312b3fcf7b7ed0c6ab5a2716142006cfee9434c287e265047feefea9a3f63731692ea4b8cd33d37f3262815daf17b936740c00ad28a9fa02ae2944c7c14fa37 SHA512 488781bfbd1867046ccc8550d8a247532dc5250e111658a75b34a6e118462bd7c84e582c76d9da955c5bd8c4e2de861f2db6e3bb19e671e53401d0cbc9fdf4e6
 MISC metadata.xml 1358 BLAKE2B ca4bb1facd33c64aa2d8c2197c97a68e08425bf3bb7cc66b3867e208a8032029cbf3d9bf3b23d38c8268228553d80d0334eacfb61cee82e19f5a7604de26d76d SHA512 d89242c1102b798d82631c4179c362461cf19d12e33cb30afcc3551f2c9b2970ad5f3a594fae504b444de294659693fc76ea560c54794692e492d4eebe23b7b9
diff --git a/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch b/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch
new file mode 100644
index 000000000000..27dce8f40607
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch
@@ -0,0 +1,45 @@
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3945
+
+From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@gnome.org>
+Date: Mon, 26 Feb 2024 16:55:44 +0000
+Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PCRE2 10.43 has now introduced support for variable-length lookbehind,
+so these tests now fail if GLib is built against PCRE2 10.43 or higher.
+
+See
+https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94.
+
+Rather than making the tests conditional on the version of PCRE2 in use,
+just remove them. They are mostly testing the PCRE2 code rather than
+any code in GLib, so don’t have much value.
+
+This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2
+days ago.
+
+Signed-off-by: Philip Withnall <pwithnall@gnome.org>
+--- a/glib/tests/regex.c
++++ b/glib/tests/regex.c
+@@ -1885,16 +1885,6 @@ test_lookbehind (void)
+   g_match_info_free (match);
+   g_regex_unref (regex);
+ 
+-  regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
+-  g_assert (regex == NULL);
+-  g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
+-  g_clear_error (&error);
+-
+-  regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
+-  g_assert (regex == NULL);
+-  g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
+-  g_clear_error (&error);
+-
+   regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
+   g_assert (regex);
+   g_assert_no_error (error);
+-- 
+GitLab
diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild
index a6f0241faaa9..7bd791bf5334 100644
--- a/dev-libs/glib/glib-2.78.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.78.4-r1.ebuild
@@ -73,6 +73,7 @@ MULTILIB_CHOST_TOOLS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
 	"${FILESDIR}"/${PN}-2.78.4-distutils.patch
+	"${FILESDIR}"/${PN}-2.78.4-libpcre2-10.43.patch
 )
 
 python_check_deps() {