[libdata-util-perl] 05/11: Drop perl-5.21.patch, applied upstream

Nick Morrott nickm-guest at moszumanska.debian.org
Tue Aug 2 00:53:28 UTC 2016


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

nickm-guest pushed a commit to branch master
in repository libdata-util-perl.

commit f8bf7ae462f44ec3c2a0fa1edc2519351aaa3bfe
Author: Nick Morrott <knowledgejunkie at gmail.com>
Date:   Mon Aug 1 23:31:22 2016 +0100

    Drop perl-5.21.patch, applied upstream
---
 debian/patches/perl-5.21.patch | 47 ------------------------------------------
 debian/patches/series          |  1 -
 2 files changed, 48 deletions(-)

diff --git a/debian/patches/perl-5.21.patch b/debian/patches/perl-5.21.patch
deleted file mode 100644
index 1e21e3f..0000000
--- a/debian/patches/perl-5.21.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: fix errors with perl >= 5.12.4
- "Stashes can now have sub refs in them."
-Origin: CPAN RT
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=99097
-Bug-Debian: https://bugs.debian.org/787454
-Author: SPROUT at cpan.org
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2015-06-02
-
---- a/DataUtil.xs
-+++ b/DataUtil.xs
-@@ -674,7 +674,14 @@
- 		CV* code;
- 
- 		if(!isGV(gv)){ /* a subroutine stub or special constant*/
--			if(SvROK((SV*)gv) && ckWARN(WARN_MISC)){
-+			       /* or perhaps a sub ref */
-+			if(SvROK((SV*)gv)) {
-+			    if(SvTYPE(SvRV(gv)) == SVt_PVCV) {
-+				if( specified_code &&
-+				    specified_code != (CV*)SvRV(gv) )
-+					return;
-+			    }
-+			    else if(ckWARN(WARN_MISC))
- 				Perl_warner(aTHX_ packWARN(WARN_MISC), "Constant subroutine %s uninstalled", name);
- 			}
- 			(void)hv_delete(stash, name, namelen, G_DISCARD);
---- a/lib/Data/Util/PurePerl.pm
-+++ b/lib/Data/Util/PurePerl.pm
-@@ -246,8 +246,16 @@
- 		my $glob = $stash->{$name};
- 
- 		if(ref(\$glob) ne 'GLOB'){
--			if(ref $glob){
-+			if(ref $glob) {
-+			    if(Scalar::Util::reftype $glob eq 'CODE'){
-+				if(defined $specified_code &&
-+				   $specified_code != $glob) {
-+					next;
-+				}
-+			    }
-+			    else {
- 				warnings::warnif(misc => "Constant subroutine $name uninstalled");
-+			    }
- 			}
- 			delete $stash->{$name};
- 			next;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d59414d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-perl-5.21.patch

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



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