Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.4.4-arm-sip.patch
Date: Wed, 30 Jun 2010 01:07:27
Message-Id: 20100630010724.1C46E2C3ED@corvid.gentoo.org
1 reavertm 10/06/30 01:07:23
2
3 Added: pykde4-4.4.4-arm-sip.patch
4 Log:
5 Add patch fixing compilation on ARM, bug 322351
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch?rev=1.1&content-type=text/plain
13
14 Index: pykde4-4.4.4-arm-sip.patch
15 ===================================================================
16 diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
17 --- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt 2010-03-29 14:57:40.000000000 +0200
18 +++ pykde4-4.4.3/python/pykde4/CMakeLists.txt 2010-05-31 15:49:17.095615617 +0200
19 @@ -75,6 +75,9 @@
20 ${KDEPIMLIBS_INCLUDE_DIRS}
21 )
22
23 +# Pull in ARM configuration options if needed
24 +STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
25 +
26 SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
27 SET(SIP_CONCAT_PARTS 8)
28 IF (WIN32)
29 @@ -82,7 +85,7 @@
30 ELSE (WIN32)
31 SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
32 ENDIF (WIN32)
33 -SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
34 +SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
35
36 # Use an extra option when compiling on Python 3.
37 IF (PYTHON_3)