diff options
| -rw-r--r-- | kde-misc/pate/files/pate-pyqt.patch | 20 | ||||
| -rw-r--r-- | kde-misc/pate/pate-9999.ebuild | 4 |
2 files changed, 23 insertions, 1 deletions
diff --git a/kde-misc/pate/files/pate-pyqt.patch b/kde-misc/pate/files/pate-pyqt.patch new file mode 100644 index 00000000000..79197f787ea --- /dev/null +++ b/kde-misc/pate/files/pate-pyqt.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c892cbd..5ff3d05 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SIP_INCLUDE_DIR} ${PYTHON_INCL + set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${PYKDE4_SIP_DIR} sip/kate) + set(SIP_CONCAT_PARTS 1) + set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG} ${PYKDE4_VERSION_TAG}) +-set(SIP_EXTRA_OPTIONS -g) ++ ++if(PYQT4_VERSION LESS "040905") ++ set(SIP_EXTRA_OPTIONS -g) ++else (PYQT4_VERSION LESS "040905") ++ # Disable QVector<int> for newer PyQt ++ set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) ++endif(PYQT4_VERSION LESS "040905") ++ + add_sip_python_module(PyKDE4.kate sip/kate/katemod.sip ${KDE4_KTEXTEDITOR_LIBS} kateinterfaces) + + diff --git a/kde-misc/pate/pate-9999.ebuild b/kde-misc/pate/pate-9999.ebuild index bf0030a0c54..954db087989 100644 --- a/kde-misc/pate/pate-9999.ebuild +++ b/kde-misc/pate/pate-9999.ebuild @@ -18,10 +18,12 @@ IUSE="" DEPEND=" $(add_kdebase_dep kate) - $(add_kdebase_dep pykde4) + $(add_kdebase_dep pykde4 '' 4.9.2-r1) " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-pyqt.patch" ) + pkg_setup() { python_set_active_version 2 python_pkg_setup |