r35547 - in /desktop/experimental/glib2.0/debian: changelog patches/91_revert_pcre_8.31_test.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jul 18 12:41:34 2012
New Revision: 35547

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35547
Log:
Add 91_revert_pcre_8.31_test.patch: Revert new regex test from 2.33.4
which depends on pcre 8.31. We still have 8.30, and we are building
against the system library instead of the bundled one.

Added:
    desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35547&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Jul 18 12:41:34 2012
@@ -3,6 +3,9 @@
   * New upstream release.
   * Drop 91_revert_schema_path_warning.patch now, we are not in final freeze
     in Ubuntu, and this is not aimed at Debian Wheezy.
+  * Add 91_revert_pcre_8.31_test.patch: Revert new regex test from 2.33.4
+    which depends on pcre 8.31. We still have 8.30, and we are building
+    against the system library instead of the bundled one.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 18 Jul 2012 14:06:38 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch?rev=35547&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch [utf-8] Wed Jul 18 12:41:34 2012
@@ -1,0 +1,18 @@
+Description: Revert new regex test from 2.33.4 which depends on pcre 8.31. In Debian we still have 8.30, and we are building against the system library instead of the bundled one.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+
+Index: glib2.0-exp/glib/tests/regex.c
+===================================================================
+--- glib2.0-exp.orig/glib/tests/regex.c	2012-07-15 03:11:28.000000000 +0200
++++ glib2.0-exp/glib/tests/regex.c	2012-07-18 14:39:35.631520519 +0200
+@@ -2165,8 +2165,10 @@
+   TEST_NEW_FAIL ("^\\c€", 0, G_REGEX_ERROR_INVALID_CONTROL_CHAR);
+   TEST_NEW_FAIL ("\\k", 0, G_REGEX_ERROR_MISSING_NAME);
+   TEST_NEW_FAIL ("a[\\NB]c", 0, G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS);
++#if 0
+   TEST_NEW_FAIL ("(*:0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEFG)XX", 0, G_REGEX_ERROR_NAME_TOO_LONG);
+   TEST_NEW_FAIL ("\\u0100", G_REGEX_RAW | G_REGEX_JAVASCRIPT_COMPAT, G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE);
++#endif
+ 
+   /* These errors can't really be tested sanely:
+    * G_REGEX_ERROR_EXPRESSION_TOO_LARGE

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35547&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Jul 18 12:41:34 2012
@@ -6,3 +6,4 @@
 10_increase_gapplication_test_delay.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
+91_revert_pcre_8.31_test.patch