From b213f0a599399f29d9a3835687e6b5600c797c08 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Apr 21 2012 22:17:34 +0000 Subject: fix FTBFS with g++ 4.7 (spurious const for KGlobalAccel::isEnabled) * Sat Apr 21 2012 Kevin Kofler - 3.16.6-9 - fix FTBFS with g++ 4.7 (spurious const for KGlobalAccel::isEnabled) --- diff --git a/PyKDE-3.16.6-gcc47.patch b/PyKDE-3.16.6-gcc47.patch new file mode 100644 index 0000000..0349165 --- /dev/null +++ b/PyKDE-3.16.6-gcc47.patch @@ -0,0 +1,12 @@ +diff -ur PyKDE-3.16.6/sip/kdecore/kglobalaccel.sip PyKDE-3.16.6-gcc47/sip/kdecore/kglobalaccel.sip +--- PyKDE-3.16.6/sip/kdecore/kglobalaccel.sip 2006-09-22 05:11:16.000000000 +0200 ++++ PyKDE-3.16.6-gcc47/sip/kdecore/kglobalaccel.sip 2012-04-22 00:12:25.000000000 +0200 +@@ -33,7 +33,7 @@ + + public: + KGlobalAccel (QObject*, const char* = 0); +- bool isEnabled () const; ++ bool isEnabled (); + void setEnabled (bool); + KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1); + diff --git a/PyKDE.spec b/PyKDE.spec index 38853e8..a2fbf2e 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -13,7 +13,7 @@ BuildRequires: libutempter-devel Summary: Python bindings for KDE3 Name: PyKDE Version: 3.16.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: http://www.riverbankcomputing.com/software/pykde/intro @@ -27,6 +27,10 @@ Patch0: PyKDE-3.16.0-kmimetype.patch # fix FTBFS with g++ 4.6 (taking address of temporary) Patch1: PyKDE-3.16.6-gcc46.patch +# fix FTBFS with g++ 4.7 +# (spurious const for KGlobalAccel::isEnabled in kglobalaccel.sip) +Patch2: PyKDE-3.16.6-gcc47.patch + ## upstream patches # candidate to fix build with latest sip Patch100: PyKDE-3.16.7.patch @@ -66,6 +70,7 @@ Sip files and documentation needed for developing with %{name} %patch0 -p1 -b .kmimetype %patch1 -p1 -b .gcc46 +%patch2 -p1 -b .gcc47 %patch100 -p1 -b .sip4_10 @@ -104,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 21 2012 Kevin Kofler - 3.16.6-9 +- fix FTBFS with g++ 4.7 (spurious const for KGlobalAccel::isEnabled) + * Thu Jan 12 2012 Fedora Release Engineering - 3.16.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild