| 1 |
commit: 81481e3598f1514ba6c544c6387e69db0044c349 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 28 11:33:14 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 28 11:33:14 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=81481e35 |
| 7 |
|
| 8 |
[kde-base/pykde4] Rebase failing patch wrt bug #520952. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
...4-4.10.1-arm-sip.patch => pykde4-4.14.0-arm-sip.patch} | 15 ++++++++------- |
| 14 |
kde-base/pykde4/pykde4-4.14.49.9999.ebuild | 2 +- |
| 15 |
2 files changed, 9 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
similarity index 64% |
| 19 |
rename from kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch |
| 20 |
rename to kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch |
| 21 |
index 73cee86..f6391a8 100644 |
| 22 |
--- a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch |
| 23 |
+++ b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch |
| 24 |
@@ -1,22 +1,23 @@ |
| 25 |
See Gentoo bug #322351. |
| 26 |
|
| 27 |
---- CMakeLists.txt |
| 28 |
-+++ CMakeLists.txt |
| 29 |
-@@ -101,6 +101,8 @@ |
| 30 |
+--- a/CMakeLists.txt |
| 31 |
++++ b/CMakeLists.txt |
| 32 |
+@@ -99,6 +99,9 @@ include_directories( |
| 33 |
${KDEPIMLIBS_INCLUDE_DIRS} |
| 34 |
) |
| 35 |
|
| 36 |
+# Pull in ARM configuration options if needed |
| 37 |
+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "") |
| 38 |
- set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip) |
| 39 |
++ |
| 40 |
+ set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) |
| 41 |
set(SIP_CONCAT_PARTS 8) |
| 42 |
if (WIN32) |
| 43 |
-@@ -108,7 +110,7 @@ |
| 44 |
+@@ -106,7 +109,7 @@ if (WIN32) |
| 45 |
else () |
| 46 |
set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) |
| 47 |
endif () |
| 48 |
-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) |
| 49 |
+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK}) |
| 50 |
|
| 51 |
- # Use an extra option when compiling on Python 3. |
| 52 |
- if (PYTHON_VERSION_MAJOR GREATER 2) |
| 53 |
+ set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild |
| 57 |
index 0bfa115..1c76427 100644 |
| 58 |
--- a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild |
| 59 |
+++ b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild |
| 60 |
@@ -56,7 +56,7 @@ src_prepare() { |
| 61 |
fi |
| 62 |
|
| 63 |
# See bug 322351 |
| 64 |
- use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch" |
| 65 |
+ use arm && epatch "${FILESDIR}/${PN}-4.14.0-arm-sip.patch" |
| 66 |
|
| 67 |
sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \ |
| 68 |
-i kpythonpluginfactory/CMakeLists.txt || die |
Archives