summaryrefslogtreecommitdiff
path: root/extra/pyqt
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-01 16:12:04 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-01 16:12:04 -0300
commitca8ab20a665411e312578954c85f1bd3913fc726 (patch)
tree98db13a83d797b74078d5b957f057a59cc91992b /extra/pyqt
parentaee193a88b17ec5a5fa2b028f42dbe4161e3390d (diff)
parent55f2d1ab0ab1bd2f7c8c7c5cefeb45f7c457a5d9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: core/systemd/PKGBUILD core/sysvinit/PKGBUILD extra/hyphen/PKGBUILD extra/imagemagick/PKGBUILD extra/lynx/PKGBUILD extra/pyqt/PKGBUILD extra/sip/PKGBUILD libre/kdelibs-libre/PKGBUILD testing/libdrm/PKGBUILD testing/xf86-video-ati/PKGBUILD
Diffstat (limited to 'extra/pyqt')
-rw-r--r--extra/pyqt/PKGBUILD53
1 files changed, 31 insertions, 22 deletions
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 49a7c000c..c2d6b4ff0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,27 +1,21 @@
-# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $
+# $Id: PKGBUILD 162740 2012-06-29 11:34:16Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9.1
-pkgrel=2
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.4
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
'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'
- '6acfe0a5a00779f946c29d5fac647ce1')
+ source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('a0b6a820633366365af5124ddbd059c7')
build() {
- # Build QtHelp (FS#27665)
- cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
- patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
-
cd "${srcdir}"
cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -48,37 +42,52 @@ build() {
make
}
+package_pyqt-common(){
+ pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+
+ cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+ make -C pyrcc DESTDIR="${pkgdir}" install
+ make -C pylupdate DESTDIR="${pkgdir}" install
+ 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/bin/{pylupdate4,pyrcc4}
+ 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-}pyuic4
+
+ # Provided by pyqt-common
+ rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+ rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+ rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
}