commit: 81481e3598f1514ba6c544c6387e69db0044c349
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 11:33:14 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 11:33:14 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=81481e35
[kde-base/pykde4] Rebase failing patch wrt bug #520952.
Package-Manager: portage-2.2.10
---
...4-4.10.1-arm-sip.patch => pykde4-4.14.0-arm-sip.patch} | 15 ++++++++-------
kde-base/pykde4/pykde4-4.14.49.9999.ebuild | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
similarity index 64%
rename from kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
rename to kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
index 73cee86..f6391a8 100644
--- a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
+++ b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
@@ -1,22 +1,23 @@
See Gentoo bug #322351.
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -101,6 +101,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,6 +99,9 @@ include_directories(
${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_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
set(SIP_CONCAT_PARTS 8)
if (WIN32)
-@@ -108,7 +110,7 @@
+@@ -106,7 +109,7 @@ if (WIN32)
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)
+ set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
+
diff --git a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
index 0bfa115..1c76427 100644
--- a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
fi
# See bug 322351
- use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
+ use arm && epatch "${FILESDIR}/${PN}-4.14.0-arm-sip.patch"
sed -e 's/kpythonpluginfactory
/kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
-i kpythonpluginfactory/CMakeLists.txt || die
