[libb-hooks-op-check-entersubforcv-perl] 03/09: Drop 0001-Perl-5.21.4-compatibility.patch, fixed upstream.

gregor herrmann gregoa at debian.org
Mon Jul 31 19:12:11 UTC 2017


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

gregoa pushed a commit to branch master
in repository libb-hooks-op-check-entersubforcv-perl.

commit 8a97c096de1b9b6e2ad37ecc208ac1aaaadb712f
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jul 31 15:02:53 2017 -0400

    Drop 0001-Perl-5.21.4-compatibility.patch, fixed upstream.
---
 .../patches/0001-Perl-5.21.4-compatibility.patch   | 34 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 35 deletions(-)

diff --git a/debian/patches/0001-Perl-5.21.4-compatibility.patch b/debian/patches/0001-Perl-5.21.4-compatibility.patch
deleted file mode 100644
index 0880cb1..0000000
--- a/debian/patches/0001-Perl-5.21.4-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6c62adb1722a96370dbe8d294d36f9382b0788fa Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Sun, 27 Dec 2015 11:47:24 +0200
-Subject: [PATCH] Perl >= 5.21.4 compatibility
-
-This fixes test failures since perl commit v5.21.3-654-ga65cc14 .
-
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94945
-Bug-Debian: https://bugs.debian.org/787499
----
- EntersubForCV.xs | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/EntersubForCV.xs b/EntersubForCV.xs
-index 870d470..4acbcab 100644
---- a/EntersubForCV.xs
-+++ b/EntersubForCV.xs
-@@ -60,7 +60,12 @@ entersub_cb (pTHX_ OP *op, void *user_data) {
- 		return op;
- 	}
- 
--	cv = GvCV (cGVOPx_gv (kid));
-+	GV *gv = cGVOPx_gv (kid);
-+	if (SvROK(gv)) { /* since v5.21.3-654-ga65cc14 */
-+		cv = (CV *)SvRV(gv);
-+	} else {
-+		cv = GvCV (gv);
-+	}
- 
- 	if (ud->cv == cv) {
- 		op = ud->cb (aTHX_ op, cv, ud->ud);
--- 
-2.6.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index de76cb9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Perl-5.21.4-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libb-hooks-op-check-entersubforcv-perl.git



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