[libdata-dump-streamer-perl] 04/07: debian/patches/perl-5.18.patch: Removed, applied upstream

Angel Abad angel at alioth.debian.org
Wed Aug 14 22:01:52 UTC 2013


This is an automated email from the git hooks/post-receive script.

angel pushed a commit to branch master
in repository libdata-dump-streamer-perl.

commit dec6b810d7e202021ea44694e44d5772efa52e82
Author: Angel Abad <angelabad at gmail.com>
Date:   Wed Aug 14 23:58:47 2013 +0200

    debian/patches/perl-5.18.patch: Removed, applied upstream
---
 debian/patches/perl-5.18.patch |   58 ----------------------------------------
 1 file changed, 58 deletions(-)

diff --git a/debian/patches/perl-5.18.patch b/debian/patches/perl-5.18.patch
deleted file mode 100644
index 13bde3b..0000000
--- a/debian/patches/perl-5.18.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix regexp dumping on perl 5.17.6+
-Origin: CPAN RT
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=82958
-Bug-Debian: http://bugs.debian.org/709665
-Forwarded: not-needed
-Author: ilmari [...] ilmari.org
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-05-25
-
----
- lib/Data/Dump/Streamer.pm |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/lib/Data/Dump/Streamer.pm
-+++ b/lib/Data/Dump/Streamer.pm
-@@ -127,7 +127,7 @@
-         # As I write this, 5.13.10 doesn't exist so I'm guessing that
-         # we can begin using the ordinary core function again.
-         eval q[
--            use re qw(regexp_pattern);
-+            use re qw(regexp_pattern is_regexp);
-             *regex= *regexp_pattern;
-         ] or die $@;
-     }
-@@ -135,7 +135,7 @@
-         # Perl-5.13.6 through perl-5.13.9 began returning modifier
-         # flags that weren't yet legal at the time.
-         eval q[
--            use re qw(regexp_pattern);
-+            use re qw(regexp_pattern is_regexp);
-             sub regex {
-                 if (wantarray) {
-                     my ($pat,$mod) = regexp_pattern($_[0]);
-@@ -153,11 +153,14 @@
-     }
-     elsif ($]>=5.009004) {
-         eval q[
--            use re qw(regexp_pattern);
-+            use re qw(regexp_pattern is_regexp);
-             *regex= *regexp_pattern;
-             1;
-         ] or die $@;
-     }
-+    else {
-+      eval q[sub is_regexp($) { defined regex($_[0]) }];
-+    }
-     if ($]<=5.008) {
-         *hidden_keys=sub(\%)  { return () };
-         *legal_keys=sub(\%)   { return keys %{$_[0]} };
-@@ -2827,7 +2830,7 @@
-         $idx=$self->{ref}{$addr};
-         $type=reftype($item);
-         $class=blessed($item);
--        $class=undef if $class and $class eq 'Regexp' and regex $item;
-+        $class=undef if $class and $class eq 'Regexp' and is_regexp $item;
- 
-         $DEBUG and
-         printf "_dump_rv %d %s %#x\n",$depth,$name,$addr;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdata-dump-streamer-perl.git



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