rev 14412 - in trunk/packages/kdebindings/debian: . patches

[Michael Casadevall]

Author: ncommander-guest
Date: 2009-04-15 16:02:43 +0000 (Wed, 15 Apr 2009)
New Revision: 14412

Added:
   trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/series
Log:
* debian/patches/make_pykde4_respect_sip_flags.diff
  - Corrects FTBFS on armel by making sure pykde4 properly parses
    the python-qt4 flags passed from PythonQt4's cmake file.

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2009-04-15 11:52:58 UTC (rev 14411)
+++ trunk/packages/kdebindings/debian/changelog	2009-04-15 16:02:43 UTC (rev 14412)
@@ -1,5 +1,13 @@
-kdebindings (4:4.2.2-2) UNRELEASED; urgency=low
+kdebindings (4:4.2.2-3) UNRELEASED; urgency=low
 
+  * debian/patches/make_pykde4_respect_sip_flags.diff
+    - Corrects FTBFS on armel by making sure pykde4 properly parses
+      the python-qt4 flags passed from PythonQt4's cmake file.
+
+ -- Michael Casadevall <mcasadevall at debian.org>  Wed, 15 Apr 2009 03:51:43 -0400
+
+kdebindings (4:4.2.2-2) unstable; urgency=low
+
   * Fix sections.
   * Use pyversions -vr instead of the removed pysupport-parseversions.
 

Added: trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2009-04-15 16:02:43 UTC (rev 14412)
@@ -0,0 +1,19 @@
+Index: kdebindings-4.2.2/python/pykde4/CMakeLists.txt
+===================================================================
+--- kdebindings-4.2.2.orig/python/pykde4/CMakeLists.txt	2009-04-15 07:59:41.000000000 +0000
++++ kdebindings-4.2.2/python/pykde4/CMakeLists.txt	2009-04-15 07:59:43.000000000 +0000
+@@ -70,10 +70,13 @@
+     ${KDE4_INCLUDE_DIR}/dnssd
+ )
+ 
++# Pull in ARM configuration options if needed
++STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
++
+ SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ SET(SIP_CONCAT_PARTS 8)
+ SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+ SET(SIP_EXTRA_OPTIONS -g)
+ 
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2009-04-15 11:52:58 UTC (rev 14411)
+++ trunk/packages/kdebindings/debian/patches/series	2009-04-15 16:02:43 UTC (rev 14412)
@@ -7,3 +7,4 @@
 07_fix_kpythonpluginfactory_build.diff
 08_csharp_plasma_examples.diff
 10_fix_kimono_dllimports.diff
+11_make_pykde4_respect_sip_flags.diff