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/qt-assistant-compat/PKGBUILD | |
| 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/qt-assistant-compat/PKGBUILD')
| -rw-r--r-- | extra/qt-assistant-compat/PKGBUILD | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD index 0b13c729a..bddad5c91 100644 --- a/extra/qt-assistant-compat/PKGBUILD +++ b/extra/qt-assistant-compat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178985 2013-03-01 10:24:14Z andrea $ +# $Id: PKGBUILD 179069 2013-03-02 22:41:59Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qt-assistant-compat pkgver=4.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="compat version of Qt Assistant" url="http://qt-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,6 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d' # separate package function does not really work here due to broken build files build() { - . /etc/profile.d/qt4.sh - cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver} patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff @@ -25,11 +23,11 @@ build() { cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi rm -f translations/assistant_adp_*.qm - qmake CONFIG+=create_prl + qmake-qt4 CONFIG+=create_prl make cd ../translations; lrelease assistant_adp_*.ts cd .. - qmake CONFIG+=create_prl + qmake-qt4 CONFIG+=create_prl make } @@ -46,11 +44,11 @@ package() { ${pkgdir}/usr/lib/libQtAssistantClient.prl # Install translations - install -d ${pkgdir}/usr/share/qt/translations/ + install -d ${pkgdir}/usr/share/qt4/translations/ install -p -m0644 translations/assistant_adp_*.qm \ - ${pkgdir}/usr/share/qt/translations/ + ${pkgdir}/usr/share/qt4/translations/ # Install prf file install -D -p -m0644 features/assistant.prf \ - ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf + ${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf } |