[SCM] Debian packaging of libregexp-optimizer-perl branch, master, updated. a1c2d0b25ec924269a091d227c56913f1b93d68f

gregor herrmann gregoa at debian.org
Wed Nov 16 17:38:59 UTC 2011


The following commit has been merged in the master branch:
commit b9f4d8e3dd4983529d230f5f79ac212944b9a5b2
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Nov 16 18:28:06 2011 +0100

    New patch perl5.14.patch: handles changed behaviour in regexp
    stringification.
    
    Closes: #636517

diff --git a/debian/patches/perl5.14.patch b/debian/patches/perl5.14.patch
new file mode 100644
index 0000000..423297d
--- /dev/null
+++ b/debian/patches/perl5.14.patch
@@ -0,0 +1,37 @@
+Description: adjust for perl 5.14: declare used variable, handle differently stringified regexp
+Origin: vendor
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=70003
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70003
+Bug-Debian: http://bugs.debian.org/636517
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-11-16
+
+--- a/lib/Regexp/List.pm
++++ b/lib/Regexp/List.pm
+@@ -16,6 +16,7 @@
+ 
+ our $FILLER = "\x{fffd}"; # fallback
+ 
++our $RE_PAREN; # predeclear
+ our $RE_START =
+     qr{(?:
+     (?!\\)\((?:\?
+--- a/t/02-list.t
++++ b/t/02-list.t
+@@ -38,11 +38,15 @@
+      q/\cZ|\cA/       => qr/\\c[ZA]/,
+ );
+ 
++# perldelta 5.14
++# Accept both old and new-style stringification
++my $modifiers = (qr/foobar/ =~ /\Q(?^/) ? "^" : "-xism";
++
+ my %t_o = 
+     (
+      q/\012|\015/     => qr/[\012\015]/,
+      q/\x20|\x3F/ =>  => qr/[\x20\x3F]/,
+-     q/\cZ|\cA/       => $] < 5.008005 ? qr/[\cZ\cA]/ : '(?-xism:[\cZ\cA])',
++     q/\cZ|\cA/       => $] < 5.008005 ? qr/[\cZ\cA]/ : "(?$modifiers:[\\cZ\\cA])",
+     );
+ 
+ for (sort {length $a <=> length $b} keys %t_l){
diff --git a/debian/patches/series b/debian/patches/series
index 001b891..88a1417 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-literal-test
+perl5.14.patch

-- 
Debian packaging of libregexp-optimizer-perl



More information about the Pkg-perl-cvs-commits mailing list