diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest index b98d83f3aa..72978f815c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest @@ -1,5 +1,6 @@ DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae DIST glib-2.84.3.tar.xz 5615704 BLAKE2B 48444b91be68530de05667e2e009dcdc63af2f95cc978a461d930b943772e52b6c9d0e797aea3a9a5713758f22ee60a190c7d601b170c6c853fce624e5c327d7 SHA512 73f2d67d2ef5b4dc8cd2f6df9ce7903853ec619924e2927adbc73d706974a7d660afea55be18e12ccb0dee1145cf4149b743278d2b128fd466e3df2bbf90ef57 DIST glib-2.84.4.tar.xz 5618200 BLAKE2B 5faee382433085cd598545a99e2e95ce430be4ac5ca10106b70f2404ddacf328f4223bc092a23025f9bf8b936619a88a9dfb220674a07e9250cf4213c6213be9 SHA512 2de9b2f7376c0e5f6ee585087090675d597c474199a10d04aad18df688b6ca77d17e93a86ec07482898663f51c82121992272496318138f77ca5ad2c340a4bd3 -DIST glib-2.86.0.tar.xz 5679348 BLAKE2B 089fa2d34dacb360943cb18ce95ad880769300540e9f8ce56045cd19d0285526b8058fa79f9f0fede1ae6b4a6d9a73f3aa0f0e0ebfa18e728dbadbee3bd30d0a SHA512 6ccf5fba13e06012135ec4b5e65c9ad61460f32fc00457081ca799a0518e872589c589b01e1846a23499fa7d4425727b95774851d7a89b15cd71260e0d13bfdd +DIST glib-2.86.1.tar.xz 5673928 BLAKE2B 571f8738e7ca5568ee9a71f0fddb9eba0eba0ec33cad7540515eb744c3104f69ffe02d5966e47eb568abd04cd111e0b3b004d7c2817177fd5f7bc26e354dec0a SHA512 b2e9a3a35cd4cbe0bb6ca493a4250df480eeb0570a0877880ff4ec6d7f1f98d828249b3b60f839b81f17a33494d95be9d42b5f20fa6bb1acb15bcf5734adba51 DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 +DIST gobject-introspection-1.86.0.tar.xz 1083172 BLAKE2B 425d60c8c4bd582c55030ed91b4c2f3982e3c502da1c6f2579c4cc1e05d82d8a8c9a533af3e4a7ae8f6a031761d763d7f7ad8031e38ae3bd7d2549c9f6bcf7f3 SHA512 a9d2edbe1cea710e10ef1ea8059a45cf5689bace43b5d2a6861809e863a6de7114b4763db8df3916ad6202c9967f48f7997acd0810a86e5e88dea7e0be88b585 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.84.4-libpcre2-10.47.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.84.4-libpcre2-10.47.patch new file mode 100644 index 0000000000..69d80f81d9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.84.4-libpcre2-10.47.patch @@ -0,0 +1,101 @@ +https://gitlab.gnome.org/GNOME/glib/-/issues/3809 +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4884 + +From 8dceb68e6e6d6e205f70c7800c01e1fc23c04616 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Thu, 23 Oct 2025 22:35:42 +0200 +Subject: [PATCH 1/3] gregex: Handle PCRE2_ERROR_MISSING_NUMBER_TERMINATOR if + defined + +When the error is defined in a new enough PCRE2 we should handle it. + +However let's not define an error message for this in this commit (just +let's use the old one that is generic enough), so that it can be backported +to stable versions without having to require new translations. + +Closes: #3809 +--- + glib/gregex.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/glib/gregex.c b/glib/gregex.c +index 969c702b4d..fac3f58fe1 100644 +--- a/glib/gregex.c ++++ b/glib/gregex.c +@@ -770,6 +770,9 @@ translate_compile_error (gint *errcode, const gchar **errmsg) + *errmsg = _("inconsistent NEWLINE options"); + break; + case PCRE2_ERROR_BACKSLASH_G_SYNTAX: ++#ifdef PCRE2_ERROR_MISSING_NUMBER_TERMINATOR ++ case PCRE2_ERROR_MISSING_NUMBER_TERMINATOR: ++#endif + *errcode = G_REGEX_ERROR_MISSING_BACK_REFERENCE; + *errmsg = _("\\g is not followed by a braced, angle-bracketed, or quoted name or " + "number, or by a plain number"); +-- +GitLab + + +From ea5aa5419468c7c030a86b52878005bed7a31c60 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Thu, 23 Oct 2025 22:37:35 +0200 +Subject: [PATCH 2/3] tests/regex: Add the error messages to tests + +It can be useful for debugging purposes +--- + glib/tests/regex.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/glib/tests/regex.c b/glib/tests/regex.c +index d7a698ec67..a052db9758 100644 +--- a/glib/tests/regex.c ++++ b/glib/tests/regex.c +@@ -131,6 +131,8 @@ test_new_fail (gconstpointer d) + + g_assert (regex == NULL); + g_assert_error (error, G_REGEX_ERROR, data->expected_error); ++ g_test_message ("Compiling pattern /%s/ failed with error: %s", ++ data->pattern, error->message); + g_error_free (error); + } + +-- +GitLab + + +From ef512a3f58ff4f918df0701d5bcfcd7de51775e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Thu, 23 Oct 2025 22:38:35 +0200 +Subject: [PATCH 3/3] gregex: Add translatable message for + PCRE2_ERROR_MISSING_NUMBER_TERMINATOR + +--- + glib/gregex.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/glib/gregex.c b/glib/gregex.c +index fac3f58fe1..6dfb05f613 100644 +--- a/glib/gregex.c ++++ b/glib/gregex.c +@@ -770,13 +770,16 @@ translate_compile_error (gint *errcode, const gchar **errmsg) + *errmsg = _("inconsistent NEWLINE options"); + break; + case PCRE2_ERROR_BACKSLASH_G_SYNTAX: +-#ifdef PCRE2_ERROR_MISSING_NUMBER_TERMINATOR +- case PCRE2_ERROR_MISSING_NUMBER_TERMINATOR: +-#endif + *errcode = G_REGEX_ERROR_MISSING_BACK_REFERENCE; + *errmsg = _("\\g is not followed by a braced, angle-bracketed, or quoted name or " + "number, or by a plain number"); + break; ++#ifdef PCRE2_ERROR_MISSING_NUMBER_TERMINATOR ++ case PCRE2_ERROR_MISSING_NUMBER_TERMINATOR: ++ *errcode = G_REGEX_ERROR_MISSING_BACK_REFERENCE; ++ *errmsg = _("syntax error in subpattern number (missing terminator?)"); ++ break; ++#endif + case PCRE2_ERROR_VERB_ARGUMENT_NOT_ALLOWED: + *errcode = G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN; + *errmsg = _("an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"); +-- +GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild index 02e612d7f3..de02e76c5d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" # them or just put the (build) deps in that rare consumer instead of recursive # RDEPEND here (due to lack of recursive DEPEND). RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.3.ebuild index 4b143af6c4..31553b2eac 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.3.ebuild @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" # them or just put the (build) deps in that rare consumer instead of recursive # RDEPEND here (due to lack of recursive DEPEND). RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.4.ebuild index ccf8b36b0c..e3897427ee 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.4.ebuild @@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" # them or just put the (build) deps in that rare consumer instead of recursive # RDEPEND here (due to lack of recursive DEPEND). RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] @@ -90,6 +91,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.84.4-libpcre2-10.47.patch ) python_check_deps() { @@ -304,15 +306,16 @@ multilib_src_configure() { export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + local -x PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:$($(tc-getPKG_CONFIG) --variable pc_system_libdirs pkg-config)" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of # g-ir-scanner to use the new one and to help workaround bugs like # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + local -x PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$($(tc-getPKG_CONFIG) --variable pc_path pkg-config)" # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + local gliblib for gliblib in glib gobject gthread gmodule gio girepository; do export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" done diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.1.ebuild index ccf8b36b0c..099b5296dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.86.1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" INTROSPECTION_PN="gobject-introspection" -INTROSPECTION_PV="1.82.0" +INTROSPECTION_PV="1.86.0" INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" SRC_URI=" ${SRC_URI} @@ -36,6 +36,7 @@ RESTRICT="!test? ( test )" # them or just put the (build) deps in that rare consumer instead of recursive # RDEPEND here (due to lack of recursive DEPEND). RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] @@ -90,6 +91,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.84.4-libpcre2-10.47.patch ) python_check_deps() { @@ -304,15 +306,16 @@ multilib_src_configure() { export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + local -x PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:$($(tc-getPKG_CONFIG) --variable pc_system_libdirs pkg-config)" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of # g-ir-scanner to use the new one and to help workaround bugs like # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + local -x PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$($(tc-getPKG_CONFIG) --variable pc_path pkg-config)" # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + local gliblib for gliblib in glib gobject gthread gmodule gio girepository; do export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" done