Attachment 936607 Details for Bug 1136340 – Fix for the SvREFCNT_inc issue

[patch] Fix for the SvREFCNT_inc issue

Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch (text/plain), 1.75 KB, created by Petr Pisar on 2014-09-11 15:57:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2014-09-11 15:57:38 UTC

Size: 1.75 KB

patch

obsolete

>From 1f62c5d8dd589e7131df0b378513148375e41317 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@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@ubuntu.com>  Tue, 26 Aug 2014 14:13:07 -0700
>
>CPAN RT#98790
>
>Signed-off-by: Petr PÃsaÅ <ppisar@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
>

Actions: View | Diff

Attachments on bug 1136340: 933729 | 933730 | 936607