diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-04 10:28:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-04 10:28:18 +0200 |
| commit | 8208fc139c28a9334ffebd48a27f4ed77de7ba0d (patch) | |
| tree | 2bac24f6981576e79e7bdd0a5cf567fe4bedf861 /extra | |
| parent | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (diff) | |
| parent | 96deddcec133f85220a15d4c435004c577395169 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
staging/kdebase-konsole/PKGBUILD
staging/kdeedu-cantor/PKGBUILD
staging/kdeedu-kstars/PKGBUILD
staging/kdeedu-step/PKGBUILD
staging/kdesdk/PKGBUILD
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/audacious/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/gnuplot/PKGBUILD | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index a057b4459..9e6682d06 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150581 2012-02-18 15:39:58Z bisson $ +# $Id: PKGBUILD 155354 2012-04-02 08:13:23Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9183aef4d805d44b4aa456563aec7f104da97546') +sha1sums=('50d2ef08d3dd48c2efb194a9fdf216fa4f8afd24') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index b02b50e8a..be35ad498 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 154928 2012-03-31 08:57:52Z ronald $ +# $Id: PKGBUILD 155381 2012-04-02 17:44:27Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot pkgver=4.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" license=('custom') depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') -makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') +makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra' 'qt') +optdepends=('qt: qt terminal') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2') @@ -32,7 +33,8 @@ build() { --with-gihdir=/usr/share/gnuplot \ --datadir=/usr/share \ --with-readline=gnu \ - --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot + --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot \ + --enable-qt make pkglibexecdir=/usr/bin } |