diff options
| -rw-r--r-- | kde-base/pykde4/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch | 22 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch | 22 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.10.1.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.10.2.ebuild | 4 |
5 files changed, 32 insertions, 27 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 6336714c3a78..7420406cf9ec 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.205 2013/04/06 00:04:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.206 2013/04/12 14:06:12 kensington Exp $ + + 12 Apr 2013; Michael Palimaka <kensington@gentoo.org> + +files/pykde4-4.10.1-arm-sip.patch, -files/pykde4-4.4.4-arm-sip.patch, + pykde4-4.10.1.ebuild, pykde4-4.10.2.ebuild: + Update arm patch wrt bug #464750. *pykde4-4.10.2 (05 Apr 2013) diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch new file mode 100644 index 000000000000..73cee86b6c57 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch @@ -0,0 +1,22 @@ +See Gentoo bug #322351. + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -101,6 +101,8 @@ + ${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) +@@ -108,7 +110,7 @@ + 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}) + + # Use an extra option when compiling on Python 3. + if (PYTHON_VERSION_MAJOR GREATER 2) 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 deleted file mode 100644 index f967c451e7df..000000000000 --- a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.10.1.ebuild b/kde-base/pykde4/pykde4-4.10.1.ebuild index 402b938337d5..8b77703202b1 100644 --- a/kde-base/pykde4/pykde4-4.10.1.ebuild +++ b/kde-base/pykde4/pykde4-4.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.1.ebuild,v 1.5 2013/04/02 20:51:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.1.ebuild,v 1.6 2013/04/12 14:06:12 kensington Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -58,7 +58,7 @@ src_prepare() { fi # See bug 322351 - use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch" + use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch" sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \ -i kpythonpluginfactory/CMakeLists.txt || die diff --git a/kde-base/pykde4/pykde4-4.10.2.ebuild b/kde-base/pykde4/pykde4-4.10.2.ebuild index c07dc91c1b4d..4b78a9fc0cee 100644 --- a/kde-base/pykde4/pykde4-4.10.2.ebuild +++ b/kde-base/pykde4/pykde4-4.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.2.ebuild,v 1.1 2013/04/06 00:04:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.2.ebuild,v 1.2 2013/04/12 14:06:12 kensington Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -58,7 +58,7 @@ src_prepare() { fi # See bug 322351 - use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch" + use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch" sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \ -i kpythonpluginfactory/CMakeLists.txt || die |