[arch-commits] Commit in kdebindings-python/repos (8 files)
Andrea Scarpino
andrea at archlinux.org
Sat Jan 5 08:36:48 UTC 2013
Date: Saturday, January 5, 2013 @ 03:36:48
Author: andrea
Revision: 174609
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
kdebindings-python/repos/kde-unstable-i686/PKGBUILD
(from rev 174608, kdebindings-python/kde-unstable/PKGBUILD)
kdebindings-python/repos/kde-unstable-i686/fix.patch
(from rev 174608, kdebindings-python/kde-unstable/fix.patch)
kdebindings-python/repos/kde-unstable-i686/pykdeuic4-symlink.patch
(from rev 174608, kdebindings-python/kde-unstable/pykdeuic4-symlink.patch)
kdebindings-python/repos/kde-unstable-x86_64/PKGBUILD
(from rev 174608, kdebindings-python/kde-unstable/PKGBUILD)
kdebindings-python/repos/kde-unstable-x86_64/fix.patch
(from rev 174608, kdebindings-python/kde-unstable/fix.patch)
kdebindings-python/repos/kde-unstable-x86_64/pykdeuic4-symlink.patch
(from rev 174608, kdebindings-python/kde-unstable/pykdeuic4-symlink.patch)
Deleted:
kdebindings-python/repos/kde-unstable-i686/PKGBUILD
kdebindings-python/repos/kde-unstable-x86_64/PKGBUILD
---------------------------------------------+
kde-unstable-i686/PKGBUILD | 164 +++++++++++++++-----------
kde-unstable-i686/fix.patch | 10 +
kde-unstable-i686/pykdeuic4-symlink.patch | 27 ++++
kde-unstable-x86_64/PKGBUILD | 164 +++++++++++++++-----------
kde-unstable-x86_64/fix.patch | 10 +
kde-unstable-x86_64/pykdeuic4-symlink.patch | 27 ++++
6 files changed, 264 insertions(+), 138 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2013-01-05 08:34:24 UTC (rev 174608)
+++ kde-unstable-i686/PKGBUILD 2013-01-05 08:36:48 UTC (rev 174609)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
- 'kdebindings-python2')
-pkgver=4.9.95
-pkgrel=1
-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')
-source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('b141ca1ba9082363bdc660ea441ec4948437218e')
-
-build() {
- export PYTHONDONTWRITEBYTECODE="TRUE"
-
- 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
- make
- cd ..
-
- mkdir build-python2
- cd build-python2
- cmake ../pykde4-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdebindings-python() {
- pkgdesc="A set of Python 3.x bindings for KDE"
- depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
- pkgdesc="A set of Python 2.x bindings for KDE"
- depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
- conflicts=('kdebindings-python<4.8.1-2')
-
- cd "${srcdir}"/build-python2
- make DESTDIR="${pkgdir}" install
-
- # Fix conflicts
- rm "${pkgdir}"/usr/bin/pykdeuic4
- ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
- "${pkgdir}"/usr/bin/python2-pykdeuic4
-
- 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
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
Copied: kdebindings-python/repos/kde-unstable-i686/PKGBUILD (from rev 174608, kdebindings-python/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2'
+ 'kdebindings-python-common')
+pkgver=4.9.97
+pkgrel=1
+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')
+source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
+ 'fix.patch'
+ 'pykdeuic4-symlink.patch')
+sha1sums=('3e8aef059de39184be505718094e67aa0d84273e'
+ 'c02432fbe0e0c600a2c422f5d2221ece73fce017'
+ '17256fde8404347043b007f736f10e8da91a4313')
+
+build() {
+ export PYTHONDONTWRITEBYTECODE="TRUE"
+
+ cd pykde4-${pkgver}
+ # KDEBUG#312618
+ patch -p1 -i "${srcdir}"/fix.patch
+
+ # Fixed upstream
+ patch -p1 -i "${srcdir}"/pykdeuic4-symlink.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
+}
+
+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}
+}
Copied: kdebindings-python/repos/kde-unstable-i686/fix.patch (from rev 174608, kdebindings-python/kde-unstable/fix.patch)
===================================================================
--- kde-unstable-i686/fix.patch (rev 0)
+++ kde-unstable-i686/fix.patch 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,10 @@
+--- 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-i686/pykdeuic4-symlink.patch (from rev 174608, kdebindings-python/kde-unstable/pykdeuic4-symlink.patch)
===================================================================
--- kde-unstable-i686/pykdeuic4-symlink.patch (rev 0)
+++ kde-unstable-i686/pykdeuic4-symlink.patch 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,27 @@
+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)
+
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2013-01-05 08:34:24 UTC (rev 174608)
+++ kde-unstable-x86_64/PKGBUILD 2013-01-05 08:36:48 UTC (rev 174609)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
- 'kdebindings-python2')
-pkgver=4.9.95
-pkgrel=1
-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')
-source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('b141ca1ba9082363bdc660ea441ec4948437218e')
-
-build() {
- export PYTHONDONTWRITEBYTECODE="TRUE"
-
- 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
- make
- cd ..
-
- mkdir build-python2
- cd build-python2
- cmake ../pykde4-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdebindings-python() {
- pkgdesc="A set of Python 3.x bindings for KDE"
- depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
- pkgdesc="A set of Python 2.x bindings for KDE"
- depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
- conflicts=('kdebindings-python<4.8.1-2')
-
- cd "${srcdir}"/build-python2
- make DESTDIR="${pkgdir}" install
-
- # Fix conflicts
- rm "${pkgdir}"/usr/bin/pykdeuic4
- ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
- "${pkgdir}"/usr/bin/python2-pykdeuic4
-
- 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
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
Copied: kdebindings-python/repos/kde-unstable-x86_64/PKGBUILD (from rev 174608, kdebindings-python/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+ 'kdebindings-python2'
+ 'kdebindings-python-common')
+pkgver=4.9.97
+pkgrel=1
+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')
+source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
+ 'fix.patch'
+ 'pykdeuic4-symlink.patch')
+sha1sums=('3e8aef059de39184be505718094e67aa0d84273e'
+ 'c02432fbe0e0c600a2c422f5d2221ece73fce017'
+ '17256fde8404347043b007f736f10e8da91a4313')
+
+build() {
+ export PYTHONDONTWRITEBYTECODE="TRUE"
+
+ cd pykde4-${pkgver}
+ # KDEBUG#312618
+ patch -p1 -i "${srcdir}"/fix.patch
+
+ # Fixed upstream
+ patch -p1 -i "${srcdir}"/pykdeuic4-symlink.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
+}
+
+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}
+}
Copied: kdebindings-python/repos/kde-unstable-x86_64/fix.patch (from rev 174608, kdebindings-python/kde-unstable/fix.patch)
===================================================================
--- kde-unstable-x86_64/fix.patch (rev 0)
+++ kde-unstable-x86_64/fix.patch 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,10 @@
+--- 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/pykdeuic4-symlink.patch (from rev 174608, kdebindings-python/kde-unstable/pykdeuic4-symlink.patch)
===================================================================
--- kde-unstable-x86_64/pykdeuic4-symlink.patch (rev 0)
+++ kde-unstable-x86_64/pykdeuic4-symlink.patch 2013-01-05 08:36:48 UTC (rev 174609)
@@ -0,0 +1,27 @@
+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