From 240e50b2e978c7709c1104ed73f45fcb1badeefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Mon, 1 Feb 2016 16:40:32 +0100 Subject: Adjust to GCC 6
--- ...96.0-Initialize-smokeperl_object-properly.patch | 37 ++++++++++++++++++++++ perl-Qt.spec | 8 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 Qt-0.96.0-Initialize-smokeperl_object-properly.patch diff --git a/Qt-0.96.0-Initialize-smokeperl_object-properly.patch b/Qt-0.96.0-Initialize-smokeperl_object-properly.patch new file mode 100644 index 0000000..279c524 --- /dev/null +++ b/Qt-0.96.0-Initialize-smokeperl_object-properly.patch @@ -0,0 +1,37 @@ +From 1d30fbbd8fad3d9ee87f1b524384bb337c559d88 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> +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ř <[email protected]> +--- + qtcore/src/util.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp +index 0c94e32..4857573 100644 +--- a/qtcore/src/util.cpp ++++ b/qtcore/src/util.cpp +@@ -2225,7 +2225,7 @@ XS(XS_AUTOLOAD) { + 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 ); +-- +2.5.0 + diff --git a/perl-Qt.spec b/perl-Qt.spec index 96eaa6a..0c49143 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 16%{?dist} +Release: 17%{?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. @@ -17,6 +17,8 @@ Patch3: Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.p # Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790, in new upstream # <git://anongit.kde.org/perlqt> Patch4: perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch +# Adjust to GCC 6, bug #1303658, CPAN RT#111630 +Patch5: Qt-0.96.0-Initialize-smokeperl_object-properly.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: cmake @@ -67,6 +69,7 @@ Development files for perl-Qt. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 mkdir build @@ -124,6 +127,9 @@ make test %{_datadir}/perlqt %changelog +* Mon Feb 01 2016 Petr Pisar <[email protected]> - 0.96.0-17 +- Adjust to GCC 6 (bug #1303658) + * Thu Jun 18 2015 Fedora Release Engineering <[email protected]> - 0.96.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=240e50b2e978c7709c1104ed73f45fcb1badeefb _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
