[PyKDE] * Sun Feb 13 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.16.6-7 - fix FTBFS with g++ 4.6 (taking

[Kevin Kofler]

commit 1aacc829947952be5fda1a2f4168c1e3160de648
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Feb 13 12:23:51 2011 +0100

    * Sun Feb 13 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.16.6-7
    - fix FTBFS with g++ 4.6 (taking address of temporary)

 PyKDE-3.16.6-gcc46.patch |   15 +++++++++++++++
 PyKDE.spec               |   13 ++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/PyKDE-3.16.6-gcc46.patch b/PyKDE-3.16.6-gcc46.patch
new file mode 100644
index 0000000..f228c88
--- /dev/null
+++ b/PyKDE-3.16.6-gcc46.patch
@@ -0,0 +1,15 @@
+diff -ur PyKDE-3.16.6/sip/kdecore/kmountpoint.sip PyKDE-3.16.6-gcc46/sip/kdecore/kmountpoint.sip
+--- PyKDE-3.16.6/sip/kdecore/kmountpoint.sip	2009-06-10 22:52:40.000000000 +0200
++++ PyKDE-3.16.6-gcc46/sip/kdecore/kmountpoint.sip	2011-02-13 12:19:36.000000000 +0100
+@@ -136,7 +136,10 @@
+     KMountPoint::List::Iterator it;
+     for( it = cList->begin(); it != cList->end(); ++it )
+     {
+-        inst = sipConvertFromType(&(KMountPoint::Ptr)(*it), sipType_KMountPoint_Ptr, sipTransferObj);
++        {
++            KMountPoint::Ptr p = *it;
++            inst = sipConvertFromType(&p, sipType_KMountPoint_Ptr, sipTransferObj);
++        }
+ 
+         if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
+         {
diff --git a/PyKDE.spec b/PyKDE.spec
index 63a123f..fcd6138 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: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 URL: 	 http://www.riverbankcomputing.com/software/pykde/intro 
@@ -22,7 +22,10 @@ Group: 	 Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html
-Patch2: PyKDE-3.16.0-kmimetype.patch
+Patch0: PyKDE-3.16.0-kmimetype.patch
+
+# fix FTBFS with g++ 4.6 (taking address of temporary)
+Patch1: PyKDE-3.16.6-gcc46.patch
 
 ## upstream patches
 # candidate to fix build with latest sip
@@ -61,7 +64,8 @@ Sip files and documentation needed for developing with %{name}
 %prep
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
-%patch2 -p1 -b .kmimetype
+%patch0 -p1 -b .kmimetype
+%patch1 -p1 -b .gcc46
 %patch100 -p1 -b .sip4_10
 
 
@@ -100,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 13 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.16.6-7
+- fix FTBFS with g++ 4.6 (taking address of temporary)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild