Date: Wednesday, June 27, 2012 @ 15:08:50 Author: andrea Revision: 162665
Upstream release; first try to remove the python3 dependence from the python2 bindings package Modified: pyqt/trunk/PKGBUILD ----------+ PKGBUILD | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-27 18:33:40 UTC (rev 162664) +++ PKGBUILD 2012-06-27 19:08:50 UTC (rev 162665) @@ -4,9 +4,9 @@ # Contributor: riai <[email protected]> Ben <[email protected]> pkgbase=pyqt -pkgname=('pyqt' 'python2-pyqt') -pkgver=4.9.1 -pkgrel=2 +pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') +pkgver=4.9.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro"; license=('GPL') @@ -14,7 +14,7 @@ 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"; 'fix-qthelp-build.patch') -md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c' +md5sums=('223f75c55f1c38c46bd164cdd4996a43' '6acfe0a5a00779f946c29d5fac647ce1') build() { @@ -48,37 +48,50 @@ make } +package_pyqt-common(){ + pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + make -C designer INSTALL_ROOT="${pkgdir}" install + + install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api +} + package_pyqt(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus') + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python-qt') - provides=('python-qt') cd "${srcdir}/PyQt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt-common + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } package_python2-pyqt(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'python2-dbus') + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - replaces=('python2-qt') - provides=('python2-qt') options=('!emptydirs') cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Provided by pyqt - rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} - rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so - rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api + # Fix conflicts with pyqt + mv "${pkgdir}"/usr/bin/{,python2-}pylupdate4 + mv "${pkgdir}"/usr/bin/{,python2-}pyrcc4 + mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 + + # Provided by pyqt-common + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api }
