summaryrefslogtreecommitdiff
path: root/extra/gnuplot
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnuplot')
-rw-r--r--extra/gnuplot/PKGBUILD27
-rw-r--r--extra/gnuplot/gnuplot-doc2texi-el.patch13
2 files changed, 13 insertions, 27 deletions
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 9cda1fb2e..c6e4955e7 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,47 +1,46 @@
-# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $
+# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuplot
-pkgver=4.6.3
-pkgrel=1
+pkgver=4.6.4
+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')
+depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4')
makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
options=('!makeflags')
install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
- gnuplot-doc2texi-el.patch)
-sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2'
- '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('54ee5ce9a0a2698b046064bd275e772673350013')
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # fix default source location; use the GDFONTPATH variable to modify at runtime
+ # fix default source location; use the GDFONTPATH variable to modify at runtime
sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
-e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
src/variable.c
+}
- (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--libexecdir=/usr/bin \
--with-gihdir=/usr/share/gnuplot \
- --with-readline=gnu
+ --with-readline=gnu --enable-qt
make pkglibexecdir=/usr/bin
}
-
package() {
cd "$srcdir/$pkgname-$pkgver"
- make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+ make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install install-info
install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
diff --git a/extra/gnuplot/gnuplot-doc2texi-el.patch b/extra/gnuplot/gnuplot-doc2texi-el.patch
deleted file mode 100644
index 49f7d3f0a..000000000
--- a/extra/gnuplot/gnuplot-doc2texi-el.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: doc2texi.el
-===================================================================
-RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
-retrieving revision 1.32
-diff -r1.32 doc2texi.el
-518c518
-< (replace-match (concat "4 " node) nil nil))
----
-> (replace-match (concat "3 " node) nil nil))
-521c521
-< (replace-match "5 " nil nil))
----
-> (replace-match "4 " nil nil))