[libb-hooks-op-check-entersubforcv-perl] 01/03: Fix for Perl 5.22 compatibility

[Niko Tyni]

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

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

commit 100ab3b736d5223ef8ef5f949bbb5c9b747f7d46
Author: Niko Tyni <ntyni at debian.org>
Date:   Sun Dec 27 11:51:55 2015 +0200

    Fix for Perl 5.22 compatibility
    
    Closes: #787499
---
 .../patches/0001-Perl-5.21.4-compatibility.patch   | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/0001-Perl-5.21.4-compatibility.patch b/debian/patches/0001-Perl-5.21.4-compatibility.patch
new file mode 100644
index 0000000..0880cb1
--- /dev/null
+++ b/debian/patches/0001-Perl-5.21.4-compatibility.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..de76cb9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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