On Fri, 30 Sep 2016 03:11:43 +0200, Andreas Beckmann wrote:
> >> Could this be fixed in experimental, too?
> > I guess that wouldn't work very well right now, since experimental
> > already has perl 5.24; so qt4-perl('s binary packages) would get a
> Now that the transition to perl 5.24 has finished, perhaps someone could
> take a look again at these packages ...I took a look; some findings: This needs also the fixes for #811672 and probably #765681. I.e. all patches from 4.8.4-1.3. All the patches apply cleanly for 4.10.2-1. Which is good; but suspicious. So: % debsnap qt4-perl 4.8.4-1 % debsnap qt4-perl --force 4.10.2-1 % debdiff source-qt4-perl/qt4-perl_4.8.4-1.dsc source-qt4-perl/qt4-perl_4.10.2-1.dsc [..] diff -Nru qt4-perl-4.8.4/debian/cdbs-install-list qt4-perl-4.10.2/debian/cdbs-install-list --- qt4-perl-4.8.4/debian/cdbs-install-list 1970-01-01 01:00:00.000000000 +0100 +++ qt4-perl-4.10.2/debian/cdbs-install-list 2013-04-07 18:01:31.000000000 +0200 @@ -0,0 +1,66 @@ [..] diff -Nru qt4-perl-4.8.4/debian/cdbs-package-list qt4-perl-4.10.2/debian/cdbs-package-list --- qt4-perl-4.8.4/debian/cdbs-package-list 1970-01-01 01:00:00.000000000 +0100 +++ qt4-perl-4.10.2/debian/cdbs-package-list 2013-04-07 18:01:31.000000000 +0200 [..] diff -Nru qt4-perl-4.8.4/debian/changelog qt4-perl-4.10.2/debian/changelog --- qt4-perl-4.8.4/debian/changelog 2012-06-20 23:52:20.000000000 +0200 +++ qt4-perl-4.10.2/debian/changelog 2013-04-13 16:23:25.000000000 +0200 @@ -1,3 +1,9 @@ +qt4-perl (4.10.2-1) experimental; urgency=low + + * New upstream release + + -- Sune Vuorela <s...@debian.org> Sun, 07 Apr 2013 15:53:50 +0000 + qt4-perl (4.8.4-1) unstable; urgency=low * New upstream release diff -Nru qt4-perl-4.8.4/debian/libqtgui4-perl.install qt4-perl-4.10.2/debian/libqtgui4-perl.install --- qt4-perl-4.8.4/debian/libqtgui4-perl.install 2010-07-13 10:56:06.000000000 +0200 +++ qt4-perl-4.10.2/debian/libqtgui4-perl.install 2013-04-07 18:03:47.000000000 +0200 @@ -1,3 +1,4 @@ usr/lib/perl5/QtGui4.pm usr/lib/perl5/auto/QtGui4/QtGui4.so usr/bin/puic4 +usr/bin/prcc4_bin So 4.10.2-1 adds debian/cdbs-install-list and debian/cdbs-package-list, a changelog entry, and one binary to debian/libqtgui4-perl.install. Besides that there are no changes. In my view this doesn't look like a new upstream release. To be honest, I'm not really sure what the purpose of 4.10.2 which is really 4.8.4 in experimental is, and I'd rather see it removed than spending more time on it. Still, if there is a purpose, I'm happy to do an NMU since I already have everything locally. -- I could just as well attach the debdiff, I guess ... Cheers, gregor -- .''`. Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Soluna Samay: My Own Medicine
diff -Nru qt4-perl-4.10.2/debian/changelog qt4-perl-4.10.2/debian/changelog
--- qt4-perl-4.10.2/debian/changelog 2013-04-13 16:23:25.000000000 +0200
+++ qt4-perl-4.10.2/debian/changelog 2016-09-30 13:14:40.000000000 +0200
@@ -1,3 +1,29 @@
+qt4-perl (4.10.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Forward-port all changes in 4.8.4-1.{1,2,3}:
+
+ [ gregor herrmann ]
+ * Fix "hardcodes /usr/lib/perl5":
+ dynamically create debian/*.install files with the correct path from
+ debian/rules during build
+ (Closes: #752809)
+
+ [ Scott Kitterman ]
+ * Fix perl 5.20 incompatiblities (Closes: #765681)
+ - Add debian/patches/qtcore4.pmupdate.diff to update QtCore.pm to current
+ upstream for perl 5.18 compatibility
+ - Add debian/patches/perl5.20.diff from Ubuntu for basic perl 5.20 compat
+ - Add debian/patches/additionalperl5.20.diff from upstream to resolve the
+ final issue
+
+ [ gregor herrmann ]
+ * Fix "FTBFS with GCC 6: cannot convert x to y":
+ add patch from upstream bug tracker to properly initialize
+ smokeperl_object. (Closes: #811672)
+
+ -- gregor herrmann <gre...@debian.org> Fri, 30 Sep 2016 13:14:40 +0200
+
qt4-perl (4.10.2-1) experimental; urgency=low
* New upstream release
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install qt4-perl-4.10.2/debian/libqtcore4-perl.install
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install 2010-07-07 15:46:05.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtcore4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-usr/lib/perl5/auto/QtCore4/QtCore4.so
-usr/lib/perl5/QtCore4/classinfo.pm
-usr/lib/perl5/QtCore4/isa.pm
-usr/lib/perl5/QtCore4/signals.pm
-usr/lib/perl5/QtCore4/debug.pm
-usr/lib/perl5/QtCore4/slots.pm
-usr/lib/perl5/QtCore4.pm
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install.in qt4-perl-4.10.2/debian/libqtcore4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtcore4-perl.install.in 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,7 @@
+@ARCHLIB@/auto/QtCore4/QtCore4.so
+@ARCHLIB@/QtCore4/classinfo.pm
+@ARCHLIB@/QtCore4/isa.pm
+@ARCHLIB@/QtCore4/signals.pm
+@ARCHLIB@/QtCore4/debug.pm
+@ARCHLIB@/QtCore4/slots.pm
+@ARCHLIB@/QtCore4.pm
diff -Nru qt4-perl-4.10.2/debian/libqtgui4-perl.install qt4-perl-4.10.2/debian/libqtgui4-perl.install
--- qt4-perl-4.10.2/debian/libqtgui4-perl.install 2013-04-07 18:03:47.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtgui4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/perl5/QtGui4.pm
-usr/lib/perl5/auto/QtGui4/QtGui4.so
-usr/bin/puic4
-usr/bin/prcc4_bin
diff -Nru qt4-perl-4.10.2/debian/libqtgui4-perl.install.in qt4-perl-4.10.2/debian/libqtgui4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtgui4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtgui4-perl.install.in 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,4 @@
+@ARCHLIB@/QtGui4.pm
+@ARCHLIB@/auto/QtGui4/QtGui4.so
+usr/bin/puic4
+usr/bin/prcc4_bin
diff -Nru qt4-perl-4.10.2/debian/libqtnetwork4-perl.install qt4-perl-4.10.2/debian/libqtnetwork4-perl.install
--- qt4-perl-4.10.2/debian/libqtnetwork4-perl.install 2010-07-13 10:56:10.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtnetwork4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtNetwork4.pm
-usr/lib/perl5/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtNetwork4.pm
+@ARCHLIB@/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.10.2/debian/libqttest4-perl.install qt4-perl-4.10.2/debian/libqttest4-perl.install
--- qt4-perl-4.10.2/debian/libqttest4-perl.install 2010-07-13 10:56:14.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqttest4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtTest4.pm
-usr/lib/perl5/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.10.2/debian/libqttest4-perl.install.in qt4-perl-4.10.2/debian/libqttest4-perl.install.in
--- qt4-perl-4.10.2/debian/libqttest4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqttest4-perl.install.in 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtTest4.pm
+@ARCHLIB@/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.10.2/debian/libqtxml4-perl.install qt4-perl-4.10.2/debian/libqtxml4-perl.install
--- qt4-perl-4.10.2/debian/libqtxml4-perl.install 2010-07-13 10:56:17.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtxml4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtXml4.pm
-usr/lib/perl5/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.10.2/debian/libqtxml4-perl.install.in qt4-perl-4.10.2/debian/libqtxml4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtxml4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtxml4-perl.install.in 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtXml4.pm
+@ARCHLIB@/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.10.2/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch qt4-perl-4.10.2/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch
--- qt4-perl-4.10.2/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,37 @@
+From 1d30fbbd8fad3d9ee87f1b524384bb337c559d88 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Mon, 1 Feb 2016 16:31:45 +0100
+Subject: [PATCH] Initialize smokeperl_object properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes this build failure with GCC 6:
+
+/builddir/build/BUILD/Qt-0.96.0/qtcore/src/util.cpp:2248:59: error: cannot convert 'bool' to 'void*' in initialization
+ static smokeperl_object nothis = { 0, 0, 0, false };
+ ^
+
+CPAN RT#111630
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+
+
+Bug: https://bugs.kde.org/show_bug.cgi?id=360844
+Bug-Debian: https://bugs.debian.org/811672
+
+---
+ qtcore/src/util.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/qtcore/src/util.cpp
++++ b/qtcore/src/util.cpp
+@@ -2231,7 +2231,7 @@
+ methcache.insert(mcid, new Smoke::ModuleIndex(mi));
+ }
+
+- static smokeperl_object nothis = { 0, 0, 0, false };
++ static smokeperl_object nothis = { 0, 0, 0, NULL };
+ smokeperl_object* call_this = 0;
+ if ( SvOK(sv_this) ) {
+ call_this = sv_obj_info( sv_this );
diff -Nru qt4-perl-4.10.2/debian/patches/additionalperl5.20.diff qt4-perl-4.10.2/debian/patches/additionalperl5.20.diff
--- qt4-perl-4.10.2/debian/patches/additionalperl5.20.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/patches/additionalperl5.20.diff 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,33 @@
+commit 1b665848e178301344386717c658386d160d222a
+Author: Chris Burel <chrisbu...@gmail.com>
+Date: Fri Oct 31 11:23:18 2014 -0700
+
+ Use a copy of the Qt::AutoLoad::AUTOLOAD variable.
+
+ This appears to be a change in Perl's behavior. The way the operator
+ overloading in PerlQt works is that it first tries to find an operator method
+ on the class itself, and then next it tries to find one in the so-called
+ QGlobalSpace, which is a place defined by the smoke library for global Qt
+ functions. Perl passes the underlying XS code the full package and function
+ being called, which PerlQt splits into 2 strings, one for the package name, and
+ one for the method name. PerlQt null-terminates the package name string, and
+ in previous versions of Perl, this modification did not affect the source
+ $AUTOLOAD variable. In Perl 5.20.0, it does update the Perl variable, and then
+ causes confusion down the line.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1136340
+ https://bugs.kde.org/show_bug.cgi?id=340518
+
+Index: qt4-perl-4.8.4/qtcore/src/util.cpp
+===================================================================
+--- qt4-perl-4.8.4.orig/qtcore/src/util.cpp 2014-10-31 22:20:27.528500094 -0400
++++ qt4-perl-4.8.4/qtcore/src/util.cpp 2014-10-31 22:20:27.524500094 -0400
+@@ -1944,7 +1944,7 @@
+ PERL_SET_CONTEXT(PL_curinterp);
+ // Figure out which package and method is being called, based on the
+ // autoload variable
+- SV* autoload = get_sv( "Qt::AutoLoad::AUTOLOAD", TRUE );
++ SV* autoload = sv_mortalcopy( get_sv( "Qt::AutoLoad::AUTOLOAD", TRUE ) );
+ char* package = SvPV_nolen( autoload );
+ char* methodname = 0;
+ // Splits off the method name from the package
diff -Nru qt4-perl-4.10.2/debian/patches/perl5.20.diff qt4-perl-4.10.2/debian/patches/perl5.20.diff
--- qt4-perl-4.10.2/debian/patches/perl5.20.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/patches/perl5.20.diff 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,46 @@
+Description: Port to Perl 5.20
+ Devel::Peek in Perl 5.20 no longer exports SvREFCNT_inc. Put a copy in
+ QtGui4::_internal instead.
+Author: Colin Watson <cjwat...@debian.org>
+Forwarded: yes
+Last-Update: 2014-10-31
+
+Index: b/qtgui/lib/QtGui4.pm
+===================================================================
+--- a/qtgui/lib/QtGui4.pm
++++ b/qtgui/lib/QtGui4.pm
+@@ -22,7 +22,6 @@
+
+ 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::UndoCommand::ON_DESTROY {
+- Devel::Peek::SvREFCNT_inc( Qt::this() );
++ QtGui4::_internal->SvREFCNT_inc( Qt::this() );
+ # XXX is there a better solution here?
+ return 1;
+ }
+Index: b/qtgui/src/QtGui4.xs
+===================================================================
+--- a/qtgui/src/QtGui4.xs
++++ b/qtgui/src/QtGui4.xs
+@@ -93,6 +93,13 @@
+ OUTPUT:
+ RETVAL
+
++SV*
++SvREFCNT_inc(sv)
++ SV* sv
++ PPCODE:
++ RETVAL = SvREFCNT_inc(sv);
++ PUSHs(RETVAL);
++
+ #// The build system with cmake and mingw relies on the visibility being set for
+ #// a dll to export that symbol. So we need to redefine XSPROTO so that we can
+ #// export the boot method.
diff -Nru qt4-perl-4.10.2/debian/patches/qtcore4.pmupdate.diff qt4-perl-4.10.2/debian/patches/qtcore4.pmupdate.diff
--- qt4-perl-4.10.2/debian/patches/qtcore4.pmupdate.diff 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/patches/qtcore4.pmupdate.diff 2016-09-30 13:14:40.000000000 +0200
@@ -0,0 +1,177 @@
+Description: Update qtcore/lib/QtCore4.pm to 4.14.1 for perl 5.20 compat
+ As described both the the Debian and KDE bugs, there are multiple bad things
+ that happen with 4.8.4 is run with perl 5.20 due to QtCore4.pm being out of
+ date (there are issues with 4.14.1 also, but those are addressed in other
+ patches). This patch matches exactly the upstream changes and each change
+ appears tied to issues with 5.20 and resolving #765681
+Origin: upstream
+Bug: https://bugs.kde.org/show_bug.cgi?id=340518
+Bug-Debian: http://bugs.debian.org/765681
+Forwarded: not-needed
+Reviewed-By: Scott Kitterman <sc...@kitterman.com>
+Last-Update: 2014-10-31
+
+Index: qt4-perl-4.8.4/qtcore/lib/QtCore4.pm
+===================================================================
+--- qt4-perl-4.8.4.orig/qtcore/lib/QtCore4.pm 2014-10-31 22:22:53.160505760 -0400
++++ qt4-perl-4.8.4/qtcore/lib/QtCore4.pm 2014-10-31 22:22:53.152505759 -0400
+@@ -1301,12 +1301,15 @@
+
+ foreach my $sp ('', ' ') {
+ my $where = $sp . $perlClassName;
+- installautoload($where);
+- # Putting this in one package gives XS_AUTOLOAD one spot to look for
+- # the autoload variable
+- package Qt::AutoLoad;
+- my $autosub = \&{$where . '::_UTOLOAD'};
+- Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} );
++
++ if (!exists &{$where . '::AUTOLOAD'}) {
++ installautoload($where);
++ # Putting this in one package gives XS_AUTOLOAD one spot to look for
++ # the autoload variable
++ package Qt::AutoLoad;
++ my $autosub = \&{$where . '::_UTOLOAD'};
++ Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} );
++ }
+ }
+
+ installSub("$perlClassName\::NEW", sub {
+@@ -1417,9 +1420,9 @@
+ my $signals = $meta->{signals};
+ my $slots = $meta->{slots};
+
+- @{$classinfos} = () if !defined @{$classinfos};
+- @{$signals} = () if !defined @{$signals};
+- @{$slots} = () if !defined @{$slots};
++ @{$classinfos} = () if !defined $classinfos;
++ @{$signals} = () if !defined $signals;
++ @{$slots} = () if !defined $slots;
+
+ # Each entry in 'stringdata' corresponds to a string in the
+ # qt_meta_stringdata_<classname> structure.
+@@ -1646,6 +1649,8 @@
+ use strict;
+ use warnings;
+
++use Scalar::Util;
++
+ # Called in the DESTROY method for all QObjects to see if they still have a
+ # parent, and avoid deleting them if they do.
+ sub Qt::Object::ON_DESTROY {
+@@ -1805,67 +1810,91 @@
+ });
+
+ sub String {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::String';
++ }
+ return bless \shift, 'Qt::String';
+- } else {
+- return bless '', 'Qt::String';
+ }
++ return bless '', 'Qt::String';
+ }
+
+ sub CString {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::CString';
++ }
+ return bless \shift, 'Qt::CString';
+- } else {
+- return bless '', 'Qt::CString';
+ }
++ return bless '', 'Qt::CString';
+ }
+
+ sub Int {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Int';
++ }
+ return bless \shift, 'Qt::Int';
+- } else {
+- return bless '', 'Qt::Int';
+ }
++ return bless '', 'Qt::Int';
+ }
+
+ sub Uint {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Uint';
++ }
+ return bless \shift, 'Qt::Uint';
+- } else {
+- return bless '', 'Qt::Uint';
+ }
++ return bless '', 'Qt::Uint';
+ }
+
+ sub Bool {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Bool';
++ }
+ return bless \shift, 'Qt::Bool';
+- } else {
+- return bless '', 'Qt::Bool';
+ }
++ return bless '', 'Qt::Bool';
+ }
+
+ sub Short {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Short';
++ }
+ return bless \shift, 'Qt::Short';
+- } else {
+- return bless '', 'Qt::Short';
+ }
++ return bless '', 'Qt::Short';
+ }
+
+ sub Ushort {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Ushort';
++ }
+ return bless \shift, 'Qt::Ushort';
+- } else {
+- return bless '', 'Qt::Ushort';
+ }
++ return bless '', 'Qt::Ushort';
+ }
+
+ sub Uchar {
+- if ( @_ ) {
++ if ( scalar @_ ) {
++ if ( Scalar::Util::readonly( $_[0] ) ) {
++ my $val = shift;
++ return bless \$val, 'Qt::Uchar';
++ }
+ return bless \shift, 'Qt::Uchar';
+- } else {
+- return bless '', 'Qt::Uchar';
+ }
++ return bless '', 'Qt::Uchar';
+ }
+
+ 1;
diff -Nru qt4-perl-4.10.2/debian/patches/series qt4-perl-4.10.2/debian/patches/series
--- qt4-perl-4.10.2/debian/patches/series 2012-06-20 23:42:59.000000000 +0200
+++ qt4-perl-4.10.2/debian/patches/series 2016-09-30 13:14:40.000000000 +0200
@@ -1 +1,5 @@
disable_tests
+qtcore4.pmupdate.diff
+perl5.20.diff
+additionalperl5.20.diff
+Qt-0.96.0-Initialize-smokeperl_object-properly.patch
diff -Nru qt4-perl-4.10.2/debian/rules qt4-perl-4.10.2/debian/rules
--- qt4-perl-4.10.2/debian/rules 2013-04-07 18:07:44.000000000 +0200
+++ qt4-perl-4.10.2/debian/rules 2016-09-30 13:14:40.000000000 +0200
@@ -3,3 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
DEB_CMAKE_EXTRA_FLAGS=-DCUSTOM_PERL_SITE_ARCH_DIR=$(shell perl -MConfig -e 'print $$Config{installvendorarch}')
+
+ARCHLIB := $(shell perl -MConfig -e 'print substr($$Config{vendorarch},1)')
+
+clean::
+ $(RM) --verbose debian/*.install
+
+common-install-arch::
+ for i in debian/*.install.in; do \
+ sed -e 's,@ARCHLIB@,$(ARCHLIB),g' $$i > debian/$$(basename $$i .in); \
+ done
signature.asc
Description: Digital Signature
