git » gnuplot.git » commit 8989da9

upstream update to 4.6.0; remove applied upstream patch

author Ronald van Haren
2012-03-31 08:57:16 UTC
committer Ronald van Haren
2012-03-31 08:57:16 UTC
parent efeb4fe8639e61202426d363ddfbc72abcbac82c

upstream update to 4.6.0; remove applied upstream patch

PKGBUILD +4 -9
lua_tikz.patch +0 -10

diff --git a/PKGBUILD b/PKGBUILD
index 69b1a11..b57e160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
-pkgver=4.4.4
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64') 
 url="http://www.gnuplot.info" 
@@ -12,17 +12,12 @@ license=('custom')
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-	"lua_tikz.patch")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
-          'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # upstram patch to fix lua/tikz terminal
-  patch -Np0 -i ${srcdir}/lua_tikz.patch  
-
   # 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
 
diff --git a/lua_tikz.patch b/lua_tikz.patch
deleted file mode 100644
index f9a939d..0000000
--- a/lua_tikz.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- term/lua/gnuplot-tikz-444.lua	Sun Nov 13 00:57:15 2011
-+++ term/lua/gnuplot-tikz.lua	Fri Nov 25 01:11:38 2011
-@@ -251,6 +251,7 @@
-   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
-   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
-       term.gp_version, term.gp_patchlevel,
-+      _VERSION,
-       string.sub(term.lua_term_revision,7,-3),
-       pgf.REVISION,os.date()))
-   if font ~= "" then
\ No newline at end of file