[arch-commits] Commit in kdebindings-python/repos/kde-unstable-x86_64 (4 files)
Andrea Scarpino
andrea at archlinux.org
Wed Jan 9 08:30:00 UTC 2013
Date: Wednesday, January 9, 2013 @ 03:30:00
Author: andrea
Revision: 174928
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
kdebindings-python/repos/kde-unstable-x86_64/PKGBUILD
(from rev 174927, kdebindings-python/kde-unstable/PKGBUILD)
kdebindings-python/repos/kde-unstable-x86_64/fix.patch
(from rev 174927, kdebindings-python/kde-unstable/fix.patch)
Deleted:
kdebindings-python/repos/kde-unstable-x86_64/fix.patch
kdebindings-python/repos/kde-unstable-x86_64/pykdeuic4-symlink.patch
-------------------------+
PKGBUILD | 92 ++++++++++++++++++++++++++++++++++++++++++++++
fix.patch | 39 ++++++++++++++-----
pykdeuic4-symlink.patch | 27 -------------
3 files changed, 121 insertions(+), 37 deletions(-)
Copied: kdebindings-python/repos/kde-unstable-x86_64/PKGBUILD (from rev 174927, kdebindings-python/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-01-09 08:30:00 UTC (rev 174928)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2'
+ 'kdebindings-python-common')
+pkgver=4.9.97
+pkgrel=2
+url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+ 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
+source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
+ 'fix.patch')
+sha1sums=('3e8aef059de39184be505718094e67aa0d84273e'
+ 'eb42111e9a1458519d0ecc5e8944ac49ae1f3340')
+
+build() {
+ export PYTHONDONTWRITEBYTECODE="TRUE"
+
+ cd pykde4-${pkgver}
+ # KDEBUG#312618
+ patch -p1 -i "${srcdir}"/fix.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../pykde4-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 \
+ -DPYKDEUIC4_ALTINSTALL=TRUE
+ make
+ cd ..
+
+ mkdir build-python2
+ cd build-python2
+ cmake ../pykde4-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DPYKDEUIC4_ALTINSTALL=TRUE
+ make
+}
+
+package_kdebindings-python() {
+ pkgdesc="A set of Python 3.x bindings for KDE"
+ 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
+
+ ln -s /usr/bin/pykdeuic4-3.3 "${pkgdir}"/usr/bin/pykdeuic4
+}
+
+package_kdebindings-python2() {
+ pkgdesc="A set of Python 2.x bindings for KDE"
+ depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common')
+ conflicts=('kdebindings-python<4.8.1-2')
+
+ cd "${srcdir}"/build-python2
+ make DESTDIR="${pkgdir}" install
+
+ # 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}
+}
Deleted: fix.patch
===================================================================
--- fix.patch 2013-01-09 08:27:57 UTC (rev 174927)
+++ fix.patch 2013-01-09 08:30:00 UTC (rev 174928)
@@ -1,10 +0,0 @@
---- pykde4-4.9.97/CMakeLists.txt~ 2013-01-04 16:49:33.259672808 +0000
-+++ pykde4-4.9.97/CMakeLists.txt 2013-01-04 16:52:26.535208136 +0000
-@@ -1,7 +1,5 @@
- project(pykde4)
-
--cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
--
- # search packages used by KDE
- find_package(KDE4 4.9.4 REQUIRED)
-
Copied: kdebindings-python/repos/kde-unstable-x86_64/fix.patch (from rev 174927, kdebindings-python/kde-unstable/fix.patch)
===================================================================
--- fix.patch (rev 0)
+++ fix.patch 2013-01-09 08:30:00 UTC (rev 174928)
@@ -0,0 +1,29 @@
+From: Luca Beltrame <lbeltrame at kde.org>
+Date: Mon, 07 Jan 2013 19:34:41 +0000
+Subject: Fix unresolved symbols appearing in PyKDE4.
+X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=bdab774f1f0874d7f0a6e14d7885d73c8101b3e9
+---
+Fix unresolved symbols appearing in PyKDE4.
+
+Apparently the CMake policy responsible for this is getting set back
+somewhere in the build system.
+
+Reporter, please close the bug if the issue is no longer applicable. I
+can't reproduce it.
+
+CCBUG: 312618
+---
+
+
+--- a/kpythonpluginfactory/CMakeLists.txt
++++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ kpythonpluginfactory.cpp)
+
+ GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME)
+-ADD_DEFINITIONS(-DLIB_PYTHON="\\"${LIB_PYTHON}\\"")
++ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
+
+ kde4_add_plugin(kpythonpluginfactory ${kpythonpluginfactory_SRCS})
+
Deleted: pykdeuic4-symlink.patch
===================================================================
--- pykdeuic4-symlink.patch 2013-01-09 08:27:57 UTC (rev 174927)
+++ pykdeuic4-symlink.patch 2013-01-09 08:30:00 UTC (rev 174928)
@@ -1,27 +0,0 @@
-From: Luca Beltrame <lbeltrame at 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-packager at 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)
-
More information about the arch-commits
mailing list