diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
| commit | e4421c38da95569f796d29c83a54f750e5222545 (patch) | |
| tree | 3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 /extra/qt5 | |
| parent | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff) | |
| parent | 0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libgdamm/PKGBUILD
community/luasql/PKGBUILD
community/myodbc/PKGBUILD
community/python2-basemap/PKGBUILD
community/ruby-cairo/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/stardict/PKGBUILD
core/diffutils/PKGBUILD
core/libsasl/PKGBUILD
core/systemd/PKGBUILD
extra/anjuta/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnokii/PKGBUILD
extra/icu/PKGBUILD
extra/libgda/PKGBUILD
extra/libmtp/PKGBUILD
extra/lighttpd/PKGBUILD
extra/mariadb/PKGBUILD
extra/mysql/PKGBUILD
extra/php/PKGBUILD
extra/qt3/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/tracker/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/lilo/PKGBUILD
libre/psi/PKGBUILD
Diffstat (limited to 'extra/qt5')
| -rw-r--r-- | extra/qt5/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 1a8a9f92f..bfd5a59b9 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $ +# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -18,14 +18,14 @@ pkgname=('qt5-base' 'qt5-translations' 'qt5-webkit') pkgver=5.0.1 -pkgrel=6 +pkgrel=10 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' - 'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' + 'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'libmng' 'openal' 'gtk2') [ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient') @@ -93,9 +93,9 @@ package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils') + 'hicolor-icon-theme' 'xdg-utils' 'icu') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' + 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver') [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver') install='qt5-base.install' @@ -267,7 +267,7 @@ package_qt5-tools() { package_qt5-webkit() { pkgdesc='A cross-platform application and UI framework (QtWebKit)' - depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite') + depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite') cd ${_pkgfqn}/qtwebkit make INSTALL_ROOT="${pkgdir}" install |