diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-23 16:36:50 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-23 16:36:50 +0100 |
| commit | 1938875bc4b7e7768d44d75a7ad6b0c31975ca47 (patch) | |
| tree | 8e198cd946186688ee37aad4bc52d056a20d467e /extra/pyqt | |
| parent | 5bd492fb549003a5f8e22b4792a33b35e79f0531 (diff) | |
| parent | 34e6c976d28892a7bd3f7578f10fcfa57865472f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/google-gadgets/PKGBUILD
community/kvirc/PKGBUILD
community/qmc2/PKGBUILD
extra/arora/PKGBUILD
extra/dhcp/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/libreoffice/PKGBUILD
extra/monodevelop/PKGBUILD
extra/php/PKGBUILD
extra/pyqt/PKGBUILD
extra/qt/PKGBUILD
extra/qt3/PKGBUILD
extra/unixodbc/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/wine/PKGBUILD
testing/nilfs-utils/PKGBUILD
Diffstat (limited to 'extra/pyqt')
| -rw-r--r-- | extra/pyqt/PKGBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index bce8baf82..f3523f20f 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141387 2011-10-30 11:14:12Z andrea $ +# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -7,12 +7,12 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') pkgver=4.8.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' - 'python-opengl' 'qt-assistant-compat') + 'python-opengl' 'qt-assistant-compat' 'qtwebkit') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') @@ -44,21 +44,21 @@ build() { } package_pyqt(){ - pkgdesc="A set of Python bindings for the Qt toolkit" - depends=('qt' 'python-sip') + pkgdesc="A set of Python 3.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python-sip') 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 } package_python2-pyqt(){ - pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" + pkgdesc="A set of Python 2.x bindings for the Qt toolkit" depends=('pyqt' 'python2-sip' 'dbus-python') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' @@ -66,6 +66,7 @@ package_python2-pyqt(){ '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 |