diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:11 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-06 16:23:34 +0000 |
commit | 6a0cb6e129d5602808f34fd2a9460fc05d9520d6 (patch) | |
tree | 40ccaa58da821358ce2d47eda61d0b1322c48126 /meta/recipes-core/glib-2.0 | |
parent | 4acdea1f3b9d0e18e899171aaa133980c1c7382e (diff) | |
download | openembedded-core-6a0cb6e129d5602808f34fd2a9460fc05d9520d6.tar.gz |
libpcre2: upgrade 10.42 -> 10.43
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch | 54 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch new file mode 100644 index 0000000000..bdfbd55899 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch @@ -0,0 +1,54 @@ +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> + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + glib/tests/regex.c | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/glib/tests/regex.c b/glib/tests/regex.c +index 1082526292..d7a698ec67 100644 +--- 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/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb index 58df7bef8f..f0fd057be7 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ file://memory-monitor.patch \ + file://fix-regex.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |