diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-30 01:07:23 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-30 01:07:23 +0000 |
| commit | f08b1287ac05733b47c493183f3425c3150d0675 (patch) | |
| tree | 2f9fae3dead9c898edba53129d987744b5687b6c /kde-base | |
| parent | Set SUPPORT_PYTHON_ABIS. (diff) | |
| download | gentoo-2-f08b1287ac05733b47c493183f3425c3150d0675.tar.gz gentoo-2-f08b1287ac05733b47c493183f3425c3150d0675.tar.bz2 gentoo-2-f08b1287ac05733b47c493183f3425c3150d0675.zip | |
Add patch fixing compilation on ARM, bug 322351
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/pykde4/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch | 22 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.4.4.ebuild | 5 |
3 files changed, 31 insertions, 2 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/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() { |