Control: tags 811672 + patch Control: tags 811672 + pending Dear maintainer,
I've prepared an NMU for qt4-perl (versioned as 4.8.4-1.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. 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: Aziza Mustafà Zadeh: Dance Of Fire
diff -Nru qt4-perl-4.8.4/debian/changelog qt4-perl-4.8.4/debian/changelog
--- qt4-perl-4.8.4/debian/changelog 2014-11-01 03:54:49.000000000 +0100
+++ qt4-perl-4.8.4/debian/changelog 2016-09-14 19:54:03.000000000 +0200
@@ -1,3 +1,12 @@
+qt4-perl (4.8.4-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 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> Wed, 14 Sep 2016 19:54:03 +0200
+
qt4-perl (4.8.4-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru qt4-perl-4.8.4/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch qt4-perl-4.8.4/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch
--- qt4-perl-4.8.4/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.8.4/debian/patches/Qt-0.96.0-Initialize-smokeperl_object-properly.patch 2016-09-14 19:47:06.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.8.4/debian/patches/series qt4-perl-4.8.4/debian/patches/series
--- qt4-perl-4.8.4/debian/patches/series 2014-11-01 03:54:59.000000000 +0100
+++ qt4-perl-4.8.4/debian/patches/series 2016-09-14 19:46:20.000000000 +0200
@@ -2,3 +2,4 @@
qtcore4.pmupdate.diff
perl5.20.diff
additionalperl5.20.diff
+Qt-0.96.0-Initialize-smokeperl_object-properly.patch
signature.asc
Description: Digital Signature
