[perl-Qt] Adjust to perl-5.20.0

[Petr Pisar]

commit 9381c56025d6db63d4a24867b24c6ba29e68d78e
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Sep 11 16:44:36 2014 +0200

    Adjust to perl-5.20.0

 ...l-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch |   67 ++++++++++++++++++++
 perl-Qt.spec                                       |    8 ++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch b/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch
new file mode 100644
index 0000000..441c064
--- /dev/null
+++ b/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch
@@ -0,0 +1,67 @@
+From 1f62c5d8dd589e7131df0b378513148375e41317 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 11 Sep 2014 16:48:39 +0200
+Subject: [PATCH] Bundle Devel::Peel::SvREFCNT_inc removed from perl-5.20.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Patch taken from Ubuntu:
+
+perlqt (4:4.14.0-0ubuntu4) utopic; urgency=medium
+
+  * Devel::Peek in Perl 5.20 no longer exports SvREFCNT_inc, so put a copy
+    in QtGui4::_internal instead.  Fixes perlkde build.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 26 Aug 2014 14:13:07 -0700
+
+CPAN RT#98790
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ qtgui/lib/QtGui4.pm | 3 +--
+ qtgui/src/QtGui4.xs | 7 +++++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/qtgui/lib/QtGui4.pm b/qtgui/lib/QtGui4.pm
+index a33f66a..2fae3d7 100644
+--- a/qtgui/lib/QtGui4.pm
++++ b/qtgui/lib/QtGui4.pm
+@@ -22,7 +22,6 @@ use warnings;
+ 
+ use QtCore4;
+ use base qw(Qt::_internal);
+-use Devel::Peek qw( SvREFCNT_inc );
+ 
+ sub init {
+     @Qt::_internal::vectorTypes{qw(Qt::Polygon Qt::PolygonF Qt::ItemSelection)}
+@@ -76,7 +75,7 @@ sub Qt::GraphicsObject::ON_DESTROY {
+ }
+ 
+ sub Qt::UndoCommand::ON_DESTROY {
+-    Devel::Peek::SvREFCNT_inc( Qt::this() );
++    QtGui4::_internal->SvREFCNT_inc( Qt::this() );
+     # XXX is there a better solution here?
+     return 1;
+ }
+diff --git a/qtgui/src/QtGui4.xs b/qtgui/src/QtGui4.xs
+index e1a0783..3a23ad4 100644
+--- a/qtgui/src/QtGui4.xs
++++ b/qtgui/src/QtGui4.xs
+@@ -91,6 +91,13 @@ getEnumList()
+     OUTPUT:
+         RETVAL
+ 
++SV*
++SvREFCNT_inc(sv)
++        SV* sv
++    PPCODE:
++        RETVAL = SvREFCNT_inc(sv);
++        PUSHs(RETVAL);
++
+ MODULE = QtGui4            PACKAGE = QtGui4
+ 
+ PROTOTYPES: ENABLE
+-- 
+1.9.3
+
diff --git a/perl-Qt.spec b/perl-Qt.spec
index 83e97d5..0d143a0 100644
--- a/perl-Qt.spec
+++ b/perl-Qt.spec
@@ -1,6 +1,6 @@
 Name:           perl-Qt
 Version:        0.96.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Perl bindings for Qt
 # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia
 # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage.
@@ -11,6 +11,8 @@ URL:            http://search.cpan.org/dist/Qt/
 Source0:        http://www.cpan.org/modules/by-module/Qt/Qt-%{version}.tar.gz
 Patch1:         0001-Changes-to-support-perl-5.18.0.patch
 Patch2:         0002-Fixes-for-perl-5.18.patch
+# Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790
+Patch3:         Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  cmake
@@ -59,6 +61,7 @@ Development files for perl-Qt.
 # Fixes from upstream for Perl 5.18
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mkdir build
 
@@ -116,6 +119,9 @@ make test
 %{_datadir}/perlqt
 
 %changelog
+* Thu Sep 11 2014 Petr Pisar <ppisar at redhat.com> - 0.96.0-13
+- Adjust to perl-5.20.0 (bug #1136340)
+
 * Fri Aug 29 2014 Jitka Plesnikova <jplesnik at redhat.com> - 0.96.0-12
 - Perl 5.20 rebuild