[PyKDE] Also fix KAccel::isEnabled.
Kevin Kofler
kkofler at fedoraproject.org
Sat Apr 21 22:41:50 UTC 2012
commit a12b6dda9b1e578001eb4b1901b46485b46adde2
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Apr 22 00:41:40 2012 +0200
Also fix KAccel::isEnabled.
PyKDE-3.16.6-gcc47.patch | 12 ++++++++++++
PyKDE.spec | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/PyKDE-3.16.6-gcc47.patch b/PyKDE-3.16.6-gcc47.patch
index 0349165..8833766 100644
--- a/PyKDE-3.16.6-gcc47.patch
+++ b/PyKDE-3.16.6-gcc47.patch
@@ -1,3 +1,15 @@
+diff -ur PyKDE-3.16.6/sip/kdecore/kaccel.sip PyKDE-3.16.6-gcc47/sip/kdecore/kaccel.sip
+--- PyKDE-3.16.6/sip/kdecore/kaccel.sip 2009-06-10 23:31:39.000000000 +0200
++++ PyKDE-3.16.6-gcc47/sip/kdecore/kaccel.sip 2012-04-22 00:30:41.000000000 +0200
+@@ -35,7 +35,7 @@
+ KAccel (QWidget* /TransferThis/, const char* = 0);
+ KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
+ KAccelActions& actions ();
+- bool isEnabled () const;
++ bool isEnabled ();
+ void setEnabled (bool);
+ bool setAutoUpdate (bool);
+
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
diff --git a/PyKDE.spec b/PyKDE.spec
index a2fbf2e..2c02e79 100644
--- a/PyKDE.spec
+++ b/PyKDE.spec
@@ -27,8 +27,8 @@ 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)
+# fix FTBFS with g++ 4.7 (spurious const for KAccel::isEnabled in kaccel.sip and
+# for KGlobalAccel::isEnabled in kglobalaccel.sip)
Patch2: PyKDE-3.16.6-gcc47.patch
## upstream patches
@@ -110,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Apr 21 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.16.6-9
-- fix FTBFS with g++ 4.7 (spurious const for KGlobalAccel::isEnabled)
+- fix FTBFS with g++ 4.7 (spurious const for K(Global)Accel::isEnabled)
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list