From 90c53f9f2981de4a14d7822066e817871cdc1362 Mon Sep 17 00:00:00 2001 From: abveritas Date: Fri, 4 Jan 2013 21:35:04 +0000 Subject: [PATCH] pykde4 patched for upstream issues, not a final fix --- kdebindings-pykde4/CMakeLists.diff | 17 +++++++++++++++++ kdebindings-pykde4/PKGBUILD | 9 ++++++--- kdebindings-pykde4/pykdeuic4_1.patch | 11 +++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 kdebindings-pykde4/CMakeLists.diff create mode 100644 kdebindings-pykde4/pykdeuic4_1.patch diff --git a/kdebindings-pykde4/CMakeLists.diff b/kdebindings-pykde4/CMakeLists.diff new file mode 100644 index 000000000..0a85b33fa --- /dev/null +++ b/kdebindings-pykde4/CMakeLists.diff @@ -0,0 +1,17 @@ +--- a/pykde4-4.9.97/CMakeLists.txt 2013-01-04 15:47:40.000000000 -0500 ++++ b/pykde4-4.9.97/CMakeLists.txt 2013-01-04 13:59:38.571700297 -0500 +@@ -1,14 +1,8 @@ + project(pykde4) + +-cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) +- + # search packages used by KDE + find_package(KDE4 4.9.4 REQUIRED) + +-# Match what's used in the main macros +-cmake_policy(SET CMP0002 OLD) +-find_package(PythonLibrary) +- + + + include(KDE4Defaults) diff --git a/kdebindings-pykde4/PKGBUILD b/kdebindings-pykde4/PKGBUILD index 51420e0ce..de18ce630 100644 --- a/kdebindings-pykde4/PKGBUILD +++ b/kdebindings-pykde4/PKGBUILD @@ -18,9 +18,11 @@ license=('GPL' 'LGPL' 'FDL') depends=('pyqt' 'qscintilla' 'boost-libs' "kdepim-runtime>=${_kdever}") makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost') source=("$_mirror/${_pkgname}-$_kdever.tar.xz" - 'pykdeuic4.patch') + 'pykdeuic4_1.patch' + 'CMakeLists.diff') md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` - '9cffaa289dabe5570ea02615e3b3da65') + '9cffaa289dabe5570ea02615e3b3da65' + 'fbdeefc300581174155e8248ddb16226') groups=("kde" "kdebindings" "kde-uninstall") provides=('kdebindings-python' 'pykde4') @@ -30,7 +32,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log') build() { cd "${srcdir}" - patch -p1 -i ${srcdir}/pykdeuic4.patch + patch -p1 -i ${srcdir}/pykdeuic4_1.patch + patch -p1 -i ${srcdir}/CMakeLists.diff rm -rf build mkdir build && cd build diff --git a/kdebindings-pykde4/pykdeuic4_1.patch b/kdebindings-pykde4/pykdeuic4_1.patch new file mode 100644 index 000000000..c1b3bb64f --- /dev/null +++ b/kdebindings-pykde4/pykdeuic4_1.patch @@ -0,0 +1,11 @@ +--- a/pykde4-4.9.97/tools/pykdeuic4/CMakeLists.txt 2012-12-30 10:05:50.465108547 +0100 ++++ b/pykde4-4.9.97/tools/pykdeuic4/CMakeLists.txt 2013-01-04 14:15:52.468438186 +0100 +@@ -10,7 +10,7 @@ + + if (NOT PYKDEUIC4_ALTINSTALL) + # Step 2: Make a the generated symlink a link to "pykdeuic4" +- install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" ) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) + endif() + + unset(_uic_name)