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/qwt | |
| 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/qwt')
| -rw-r--r-- | extra/qwt/PKGBUILD | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index a6c9c05c5..4cbf4ecc5 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 178991 2013-03-01 10:24:47Z andrea $ +# $Id: PKGBUILD 179060 2013-03-02 20:03:20Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt pkgver=6.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64' 'mips64el') url="http://qwt.sourceforge.net/" depends=('qt4') -options=('!makeflags') license=("custom:$pkgname") -source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \ +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \ "qwtconfig-archlinux.pri") sha1sums=('301cca0c49c7efc14363b42e082b09056178973e' 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { - . /etc/profile.d/qt4.sh - cd ${srcdir}/${pkgname}-${pkgver} # copy our config file to the right place - install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \ - ${srcdir}/${pkgname}-${pkgver}/qwtconfig.pri + cp ${srcdir}/qwtconfig-archlinux.pri qwtconfig.pri # build qwt: - qmake qwt.pro + qmake-qt4 qwt.pro make } @@ -39,11 +35,12 @@ package() { install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \ ${pkgdir}/usr/lib/qt4/plugins/designer/ - # Move man files to proper directory. -# install -d ${pkgdir}/usr/share/man/man3 -# mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3 + # needed by qmake (FS#30407) + install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/ + install -m644 qwtconfig.pri qwt.prf \ + "${pkgdir}"/usr/share/qt4/mkspecs/features/ # install licence install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/license.txt + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } |