[gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.14.0-arm-sip.patch

[Michael Palimaka (kensington)]

kensington    14/08/28 11:31:52

  Added:                pykde4-4.14.0-arm-sip.patch
  Log:
  Rebase failing patch wrt bug #520952.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.1                  kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch?rev=1.1&content-type=text/plain

Index: pykde4-4.14.0-arm-sip.patch
===================================================================
See Gentoo bug #322351.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,6 +99,9 @@ include_directories(
     ${KDEPIMLIBS_INCLUDE_DIRS}
 )
 
+# Pull in ARM configuration options if needed
+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
+
 set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
 set(SIP_CONCAT_PARTS 8)
 if (WIN32)
@@ -106,7 +109,7 @@ if (WIN32)
 else ()
     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
 endif ()
-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
 
 set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)