diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-08-28 21:33:14 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-08-28 21:33:14 +1000 |
| commit | 81481e3598f1514ba6c544c6387e69db0044c349 (patch) | |
| tree | 59a41bbdd9e33ccc964e4c6244b299e7caf4ca6e /kde-base/pykde4/files | |
| parent | bc99e580192f468cc3683dc7d50c88c8e9573fd5 (diff) | |
| download | kde-81481e3598f1514ba6c544c6387e69db0044c349.tar.gz kde-81481e3598f1514ba6c544c6387e69db0044c349.tar.bz2 kde-81481e3598f1514ba6c544c6387e69db0044c349.zip | |
[kde-base/pykde4] Rebase failing patch wrt bug #520952.
Package-Manager: portage-2.2.10
Diffstat (limited to 'kde-base/pykde4/files')
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch (renamed from kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch) | 15 |
1 files changed, 8 insertions, 7 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 index 73cee86b6c5..f6391a8ec71 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) + |