Add patch fixing compilation on ARM, bug 322351

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 14 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index b50393f22718..911781735a34 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.75 2010/06/28 03:45:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.76 2010/06/30 01:07:22 reavertm Exp $
+
+  30 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> pykde4-4.4.4.ebuild,
+  +files/pykde4-4.4.4-arm-sip.patch:
+  Add patch fixing compilation on ARM, bug 322351
 
   28 Jun 2010; Christian Faulhammer <fauli@gentoo.org> pykde4-4.4.4.ebuild:
   x86 stable, bug 322791
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index f4cf19289c14..b7aa1a8c98b5 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pykde4-4.3.4-typedefs.sip.patch 8212 RMD160 19788bb5089963ae703b1391e28c649bbc9fea6a SHA1 6d9a569df288d63f1c957e25db562cbe86f2afea SHA256 9b3eafc7e6954c0be578d979713de9874f448b73f3ff51e60568469902ad398d
 AUX pykde4-4.3.5-fix-pykdeuic4.patch 524 RMD160 e0dad917bcdbc1e4cc52a353c3d6f45c7d712904 SHA1 266460bb633e0756591291fabe61a6c618165cb6 SHA256 a1542fd30d4b5ceba422a3b7b7ae560090590ab1f1ead78c1c272a1d48d6ce38
+AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 DIST kdebindings-4.3.5.tar.bz2 4881006 RMD160 96fd389226116717f1ab28e71c788a99a1a15981 SHA1 0273013e4b74a7b1bc4cfc8375c80b5c19cf33e6 SHA256 7ff4a3e95dde89b59bb9fc13cd32feca7bad7b096703c7710bcd82fc326c53be
 DIST kdebindings-4.4.4.tar.bz2 5091453 RMD160 38725fb1fec359e2b3e3acf23baf07e6d615dfdf SHA1 db5afa2a70558e34838a0f9296f008035e03f064 SHA256 bcfd514e8e4a88f1a36750b8b5fc3cbc52497f5ea22f811ff718301d7687c5f2
 EBUILD pykde4-4.3.5-r1.ebuild 2161 RMD160 718b11377d93f7f2a7cfe667ff15a976810d5662 SHA1 7590e2692f569124fd7ab8ca80fef029694bf0e1 SHA256 4f1f20ca0c704d83b574f692f9180855a578aba0c8c36f149729733a1a00a835
-EBUILD pykde4-4.4.4.ebuild 1915 RMD160 e5e0e2d0e397b42e89666e8c82fbfc87fd6f83e3 SHA1 07d9bb28657100da052661196e737d3babb70c74 SHA256 8734ec790338bcab627c28ac29410299546dbccebe02cd8ec492b163bc23108c
-MISC ChangeLog 9665 RMD160 85b33cc22148af8b86d8a15d752b3ac8c5848889 SHA1 d5ab27c703a4b8dc9f189327276e6cb31b92d3cb SHA256 ec8f3c55841c97a51378ed0080c47aad922d83ea5a27e25a9c033edecf366944
+EBUILD pykde4-4.4.4.ebuild 1995 RMD160 24fe87b941489df9e826d50a38eacfbec744f84c SHA1 ed16b1b7c0e752c7ab01aa465c73aeb00c06ab64 SHA256 eb69c7df74fd97e3099a95c54bb7409af3e71c0069faf43d023515d83575957e
+MISC ChangeLog 9831 RMD160 ed86af564f4af560660fe395bfbf4901f9147f46 SHA1 8a2a3a2ae8934277752974b794102840b0e729d4 SHA256 5f1565ef58b43152123398c36d99df67b4e00762776570cfa4a42cfd37b4fe9e
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwoGw0ACgkQNQqtfCuFnePZSQCgmX/d/hg+Y0NyBVDnkfTELPYw
-+2oAoIgYnTiUQT4s7qVv62TzVmBhw3km
-=CNVo
------END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
new file mode 100644
index 000000000000..f967c451e7df
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
@@ -0,0 +1,22 @@
+diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
+--- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt	2010-03-29 14:57:40.000000000 +0200
++++ pykde4-4.4.3/python/pykde4/CMakeLists.txt	2010-05-31 15:49:17.095615617 +0200
+@@ -75,6 +75,9 @@
+     ${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 ${PYQT4_SIP_DIR} sip)
+ SET(SIP_CONCAT_PARTS 8)
+ IF (WIN32)
+@@ -82,7 +85,7 @@
+ ELSE (WIN32)
+     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ ENDIF (WIN32)
+-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+ 
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)
diff --git a/kde-base/pykde4/pykde4-4.4.4.ebuild b/kde-base/pykde4/pykde4-4.4.4.ebuild
index 4f01a1dfeb6d..2927c3482f70 100644
--- a/kde-base/pykde4/pykde4-4.4.4.ebuild
+++ b/kde-base/pykde4/pykde4-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.4.ebuild,v 1.5 2010/06/28 03:45:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.4.ebuild,v 1.6 2010/06/30 01:07:22 reavertm Exp $
 
 EAPI="3"
 
@@ -37,6 +37,9 @@ src_prepare() {
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${P}-4.4.4-arm-sip.patch"
 }
 
 src_configure() {