diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-04-12 23:56:44 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-12 23:56:44 +1000 |
| commit | 0bdd10998bbed05491d76c9aad4ae7d8f4a23f1f (patch) | |
| tree | 0dd675445cf42871e449a7ce0465da66c42ea83b | |
| parent | 9d42dd0aa4f0a39d4517eae51fe0d05a598c98ef (diff) | |
| download | kde-0bdd10998bbed05491d76c9aad4ae7d8f4a23f1f.tar.gz kde-0bdd10998bbed05491d76c9aad4ae7d8f4a23f1f.tar.bz2 kde-0bdd10998bbed05491d76c9aad4ae7d8f4a23f1f.zip | |
[kde-base/pykde4] Update arm patch wrt bug #464750.
Package-Manager: portage-2.1.11.60
| -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.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-9999.ebuild | 2 |
4 files changed, 24 insertions, 24 deletions
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 00000000000..73cee86b6c5 --- /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 f967c451e7d..00000000000 --- 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.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild index c68f9c21dba..63467233684 100644 --- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild +++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild @@ -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-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild index c68f9c21dba..63467233684 100644 --- a/kde-base/pykde4/pykde4-9999.ebuild +++ b/kde-base/pykde4/pykde4-9999.ebuild @@ -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 |