r49505 - in /desktop/unstable/glib2.0/debian: changelog patches/gregex-loosen-behaviour-testing.patch patches/series
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Sun Aug 14 14:39:43 UTC 2016
Author: smcv
Date: Sun Aug 14 14:39:43 2016
New Revision: 49505
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49505
Log:
d/p/gregex-loosen-behaviour-testing.patch: add patch from upstream bug 767240 (not applied yet) to relax assertions about PCRE's behaviour, which changed in 8.38
Added:
desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/series
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=49505&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sun Aug 14 14:39:43 2016
@@ -7,6 +7,9 @@
(Closes: #821031)
* debian/tests/installed-tests: explicitly select built-in VFS and
volume monitor
+ * d/p/gregex-loosen-behaviour-testing.patch: add patch from upstream
+ bug 767240 (not applied yet) to relax assertions about PCRE's behaviour,
+ which changed in 8.38
-- Simon McVittie <smcv at debian.org> Sun, 14 Aug 2016 14:46:44 +0100
Added: desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch?rev=49505&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch [utf-8] Sun Aug 14 14:39:43 2016
@@ -0,0 +1,64 @@
+From: Allison Lortie <desrt at desrt.ca>
+Date: Tue, 9 Aug 2016 12:46:30 +0200
+Subject: gregex: loosen behaviour testing
+
+Circa 8.38, upstream PCRE (intentionally?) changed behaviour with
+respect to whether options set with expressions like "(?i)" at the
+top-level were reported via the pcre_fullinfo() API as having been
+requested during compilation.
+
+GLib contained a test that verified that these options were indeed
+reported as if they had been provided as flags on the API.
+
+Remove that check, and document the no-longer-deterministic behaviour.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=767240
+Applied-upstream: no
+---
+ glib/gregex.c | 4 ++++
+ glib/tests/regex.c | 13 ++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/glib/gregex.c b/glib/gregex.c
+index 325f8d2..0cfe639 100644
+--- a/glib/gregex.c
++++ b/glib/gregex.c
+@@ -1582,6 +1582,10 @@ g_regex_get_max_lookbehind (const GRegex *regex)
+ *
+ * Returns the compile options that @regex was created with.
+ *
++ * Depending on the version of PCRE that is used, this may or may not
++ * include flags set by option expressions such as `(?i)` found at the
++ * top-level within the compiled pattern.
++ *
+ * Returns: flags from #GRegexCompileFlags
+ *
+ * Since: 2.26
+diff --git a/glib/tests/regex.c b/glib/tests/regex.c
+index bd42230..a597214 100644
+--- a/glib/tests/regex.c
++++ b/glib/tests/regex.c
+@@ -2218,17 +2218,16 @@ main (int argc, char *argv[])
+ TEST_NEW("(?P<A>x)|(?P<A>y)", G_REGEX_DUPNAMES | G_REGEX_OPTIMIZE, 0);
+ /* This gives "internal error: code overflow" with pcre 6.0 */
+ TEST_NEW("(?i)(?-i)", 0, 0);
++ TEST_NEW ("(?i)a", 0, 0);
++ TEST_NEW ("(?m)a", 0, 0);
++ TEST_NEW ("(?s)a", 0, 0);
++ TEST_NEW ("(?x)a", 0, 0);
++ TEST_NEW ("(?J)a", 0, 0);
++ TEST_NEW ("(?U)[a-z]+", 0, 0);
+
+- /* Check that flags are correct if the pattern modifies them */
+ /* TEST_NEW_CHECK_FLAGS(pattern, compile_opts, match_ops, real_compile_opts, real_match_opts) */
+ TEST_NEW_CHECK_FLAGS ("a", G_REGEX_OPTIMIZE, 0, G_REGEX_OPTIMIZE, 0);
+ TEST_NEW_CHECK_FLAGS ("a", G_REGEX_RAW, 0, G_REGEX_RAW, 0);
+- TEST_NEW_CHECK_FLAGS ("(?i)a", 0, 0, G_REGEX_CASELESS, 0);
+- TEST_NEW_CHECK_FLAGS ("(?m)a", 0, 0, G_REGEX_MULTILINE, 0);
+- TEST_NEW_CHECK_FLAGS ("(?s)a", 0, 0, G_REGEX_DOTALL, 0);
+- TEST_NEW_CHECK_FLAGS ("(?x)a", 0, 0, G_REGEX_EXTENDED, 0);
+- TEST_NEW_CHECK_FLAGS ("(?J)a", 0, 0, G_REGEX_DUPNAMES, 0);
+- TEST_NEW_CHECK_FLAGS ("(?U)[a-z]+", 0, 0, G_REGEX_UNGREEDY, 0);
+ TEST_NEW_CHECK_FLAGS ("(?X)a", 0, 0, 0 /* not exposed by GRegex */, 0);
+ TEST_NEW_CHECK_FLAGS ("^.*", 0, 0, G_REGEX_ANCHORED, 0);
+ TEST_NEW_CHECK_FLAGS ("(*UTF8)a", 0, 0, 0 /* this is the default in GRegex */, 0);
Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=49505&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Sun Aug 14 14:39:43 2016
@@ -12,3 +12,4 @@
0001-timer-test-use-volatile-for-locals.patch
skip-broken-timer-test.patch
0001-Fix-trashing-on-overlayfs.patch
+gregex-loosen-behaviour-testing.patch
More information about the pkg-gnome-commits
mailing list