diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-15 16:50:36 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-15 16:50:36 +0200 |
commit | db51c0d1e6b99baeb47d6dfd388fc8eaa71bd882 (patch) | |
tree | 9984387523914b6cbf7059c289b9ef211b9c78cc /extra/pyqt | |
parent | 1e3535ede081f5994d058771b3f36f7f80ce34c4 (diff) | |
parent | 0f99ce5b4d8585285835a277dcbdaf1493d00635 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mlt/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/xmonad/PKGBUILD
extra/cabal-install/PKGBUILD
extra/cups/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/pyqt/PKGBUILD
extra/swt/PKGBUILD
kde-unstable/kactivities/PKGBUILD
kde-unstable/kdeaccessibility-jovie/PKGBUILD
kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
kde-unstable/kdeaccessibility-kmag/PKGBUILD
kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
kde-unstable/kdeaccessibility-kmouth/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-kross/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-analitza/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-pairs/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegames/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
kde-unstable/kdegraphics-okular/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
kde-unstable/kdemultimedia-juk/PKGBUILD
kde-unstable/kdemultimedia-kmix/PKGBUILD
kde-unstable/kdemultimedia-kscd/PKGBUILD
kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils-filelight/PKGBUILD
kde-unstable/kdeutils-kcalc/PKGBUILD
kde-unstable/kdeutils-kcharselect/PKGBUILD
kde-unstable/kdeutils-kdf/PKGBUILD
kde-unstable/kdeutils-kfloppy/PKGBUILD
kde-unstable/kdeutils-kgpg/PKGBUILD
kde-unstable/kdeutils-kremotecontrol/PKGBUILD
kde-unstable/kdeutils-ktimer/PKGBUILD
kde-unstable/kdeutils-kwallet/PKGBUILD
kde-unstable/kdeutils-superkaramba/PKGBUILD
kde-unstable/kdeutils-sweeper/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkcddb/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
kde-unstable/nepomuk-core/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus-core/dbus.install
Diffstat (limited to 'extra/pyqt')
-rw-r--r-- | extra/pyqt/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index db25947aa..49a7c000c 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $ +# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> @@ -6,12 +6,12 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') pkgver=4.9.1 -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' 'qtwebkit') +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' @@ -50,7 +50,7 @@ build() { package_pyqt(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip') + depends=('qtwebkit' 'python-sip' 'python-dbus') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') @@ -64,7 +64,7 @@ package_pyqt(){ package_python2-pyqt(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'dbus-python') + depends=('pyqt' 'python2-sip' 'python2-dbus') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' |