diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-03 10:42:41 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-03 10:42:41 +0100 |
| commit | ab6933b5cc48c6dfb3390b78c579832ba87e001d (patch) | |
| tree | acf5e3b5502a20a7458167e39d9c7c75b96f27cb /extra/qt4 | |
| parent | b93266a2e63bdf4d37a87a5e59ff36d78de40be0 (diff) | |
| parent | 945c9cd1e94fab87653f84598812dec707843d26 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gmerlin/PKGBUILD
community/volumeicon/PKGBUILD
extra/graphite/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/openjdk6/PKGBUILD
extra/qt4/PKGBUILD
Diffstat (limited to 'extra/qt4')
| -rw-r--r-- | extra/qt4/PKGBUILD | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 00043864e..43c056c6b 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179026 2013-03-01 17:55:20Z andrea $ +# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -72,7 +72,7 @@ build() { -sysconfdir /etc/xdg \ -examplesdir /usr/share/doc/qt4/examples \ -demosdir /usr/share/doc/qt4/demos \ - -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ -system-sqlite \ -no-phonon \ -no-phonon-backend \ @@ -127,8 +127,6 @@ package() { find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - # Do not install the qttools - rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist} - rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer - rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm + # The TGA plugin is broken (FS#33568) + rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so } |