r44292 - in /desktop/experimental/glib2.0/debian: changelog patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Mon May  4 12:15:11 2015
New Revision: 44292

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44292
Log:
d/p/regex-test-do-not-assert-that-system-PCRE-still-has-.patch:
update to my latest version submitted upstream, which asserts that
a newer-than-8.32 system PCRE does not have the bug in question.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=44292&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Mon May  4 12:15:11 2015
@@ -4,6 +4,9 @@
     update to my latest version submitted upstream, which fixes undefined
     behaviour in the unlikely event that G_REGEX_OPTIMIZE is combined
     with g_regex_match_all().
+  * d/p/regex-test-do-not-assert-that-system-PCRE-still-has-.patch:
+    update to my latest version submitted upstream, which asserts that
+    a newer-than-8.32 system PCRE does not have the bug in question.
 
  -- Simon McVittie <smcv at debian.org>  Mon, 04 May 2015 12:15:17 +0100
 

Modified: desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch?rev=44292&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch	[utf-8] Mon May  4 12:15:11 2015
@@ -1,29 +1,49 @@
-From 593b7d5f100e4893b8b958f8ca0dc84c7a08d579 Mon Sep 17 00:00:00 2001
+From 4cbc0688c5b1db7bd633542572690d6d61d5f343 Mon Sep 17 00:00:00 2001
 From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Sun, 20 Jul 2014 19:33:59 +0100
-Subject: [PATCH 2/4] regex test: do not assert that system PCRE still has an
+Date: Tue, 28 Apr 2015 10:10:58 +0100
+Subject: [PATCH 1/2] regex test: do not assert that system PCRE still has an
  8.31 bug
 
-This was fixed in 8.32.
+This was fixed in 8.32, so if we have that version, assert that it is
+fixed; if we don't (e.g. the current internal pcre), still don't
+assert that it *isn't* fixed.
 
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=733325
 ---
- glib/tests/regex.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ glib/tests/regex.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
+diff --git a/glib/tests/regex.c b/glib/tests/regex.c
+index b886b06..5e5b88d 100644
 --- a/glib/tests/regex.c
 +++ b/glib/tests/regex.c
-@@ -2387,8 +2387,12 @@
+@@ -25,6 +25,12 @@
+ #include <locale.h>
+ #include "glib.h"
+ 
++#ifdef USE_SYSTEM_PCRE
++#include <pcre.h>
++#else
++#include "glib/pcre/pcre.h"
++#endif
++
+ /* U+20AC EURO SIGN (symbol, currency) */
+ #define EURO "\xe2\x82\xac"
+ /* U+00E0 LATIN SMALL LETTER A WITH GRAVE (letter, lowercase) */
+@@ -2446,8 +2452,12 @@ main (int argc, char *argv[])
    /* Test that othercasing in our pcre/glib integration is bug-for-bug compatible
     * with pcre's internal tables. Bug #678273 */
    TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "DŽ", -1, 0, 0, TRUE);
 -  TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "Dž", -1, 0, 0, FALSE);
    TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "dž", -1, 0, 0, TRUE);
-+#ifndef USE_SYSTEM_PCRE
-+  /* This is a bug, which was fixed in 8.32. A system pcre might
-+   * be that version or newer, so we cannot assert that it has this bug. */
-+  TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "Dž", -1, 0, 0, FALSE);
++#if PCRE_MAJOR > 8 || (PCRE_MAJOR == 8 && PCRE_MINOR >= 32)
++  /* This would incorrectly fail to match in pcre < 8.32, so only assert
++   * this for known-good pcre. */
++  TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "Dž", -1, 0, 0, TRUE);
 +#endif
  
    /* TEST_MATCH_NEXT#(pattern, string, string_len, start_position, ...) */
    TEST_MATCH_NEXT0("a", "x", -1, 0);
+-- 
+2.1.4
+