Date: Saturday, January 5, 2013 @ 03:06:30 Author: andrea Revision: 174570
Move common stuff in another package Added: kdebindings-python/kde-unstable/pykdeuic4-symlink.patch Modified: kdebindings-python/kde-unstable/PKGBUILD -------------------------+ PKGBUILD | 44 +++++++++++++++++++++++++++++++++----------- pykdeuic4-symlink.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-05 08:06:18 UTC (rev 174569) +++ PKGBUILD 2013-01-05 08:06:30 UTC (rev 174570) @@ -3,7 +3,8 @@ pkgbase=kdebindings-python pkgname=('kdebindings-python' - 'kdebindings-python2') + 'kdebindings-python2' + 'kdebindings-python-common') pkgver=4.9.97 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' @@ -13,16 +14,21 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz" - 'fix.patch') + 'fix.patch' + 'pykdeuic4-symlink.patch') sha1sums=('3e8aef059de39184be505718094e67aa0d84273e' - 'c02432fbe0e0c600a2c422f5d2221ece73fce017') + 'c02432fbe0e0c600a2c422f5d2221ece73fce017' + '17256fde8404347043b007f736f10e8da91a4313') build() { export PYTHONDONTWRITEBYTECODE="TRUE" + cd pykde4-${pkgver} # KDEBUG#312618 - cd pykde4-${pkgver} patch -p1 -i "${srcdir}"/fix.patch + + # Fixed upstream + patch -p1 -i "${srcdir}"/pykdeuic4-symlink.patch cd ../ mkdir build @@ -48,26 +54,42 @@ package_kdebindings-python() { pkgdesc="A set of Python 3.x bindings for KDE" - depends=('kdepim-runtime' 'pyqt' 'qscintilla') + depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install + + # Provided by kdebindings-python-common + rm -r "${pkgdir}"/usr/share/apps/pykde4/examples + rm -r "${pkgdir}"/usr/share/sip/PyKDE4 } package_kdebindings-python2() { pkgdesc="A set of Python 2.x bindings for KDE" - depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') + depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common') conflicts=('kdebindings-python<4.8.1-2') cd "${srcdir}"/build-python2 make DESTDIR="${pkgdir}" install - # Fix conflicts - mv "${pkgdir}"/usr/share/apps/pykde4/examples \ - "${pkgdir}"/usr/share/apps/pykde4/python2-examples - mv "${pkgdir}"/usr/share/sip/PyKDE4 \ - "${pkgdir}"/usr/share/sip/python2-PyKDE4 + # Provided by kdebindings-python-common + rm -r "${pkgdir}"/usr/share/apps/pykde4/examples + rm -r "${pkgdir}"/usr/share/sip/PyKDE4 + # pykdeuic4 should point to the python3 version + #rm "${pkgdir}"/usr/bin/pykdeuic4 + # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } + +package_kdebindings-python-common() { + pkgdesc="Common files shared between python2 and python3 kdebindings" + depends=('qscintilla') + conflicts=('kdebindings-python<4.8.1-2') + + cd build + make DESTDIR="${pkgdir}" install + + rm -r "${pkgdir}"/usr/{bin,lib} +} Added: pykdeuic4-symlink.patch =================================================================== --- pykdeuic4-symlink.patch (rev 0) +++ pykdeuic4-symlink.patch 2013-01-05 08:06:30 UTC (rev 174570) @@ -0,0 +1,27 @@ +From: Luca Beltrame <lbeltr...@kde.org> +Date: Fri, 04 Jan 2013 19:31:12 +0000 +Subject: Use a slightly better strategy for symlinking: although the previous +X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=4e8ee28f3a314edef2a8489854c0ed58ac668070 +--- +Use a slightly better strategy for symlinking: although the previous +code working locally, distribution users had issues in it not properly +working. + +Patch by Raymond Wooninck. + +CCMAIL: kde-packa...@kde.org +--- + + +--- a/tools/pykdeuic4/CMakeLists.txt ++++ b/tools/pykdeuic4/CMakeLists.txt +@@ -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) +