[arch-commits] Commit in gnuplot/trunk (PKGBUILD lua_tikz.patch)

2012-03-31 Thread Ronald van Haren
Date: Saturday, March 31, 2012 @ 04:57:16
  Author: ronald
Revision: 154927

upgpkg: gnuplot 4.6.0-1

upstream update to 4.6.0; remove applied upstream patch

Modified:
  gnuplot/trunk/PKGBUILD
Deleted:
  gnuplot/trunk/lua_tikz.patch

+
 PKGBUILD   |   13 -
 lua_tikz.patch |   10 --
 2 files changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-31 08:27:07 UTC (rev 154926)
+++ PKGBUILD2012-03-31 08:57:16 UTC (rev 154927)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom 
 
 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"; 
@@ -13,17 +13,12 @@
 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
 

Deleted: lua_tikz.patch
===
--- lua_tikz.patch  2012-03-31 08:27:07 UTC (rev 154926)
+++ lua_tikz.patch  2012-03-31 08:57:16 UTC (rev 154927)
@@ -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



[arch-commits] Commit in gnuplot/trunk (PKGBUILD lua_tikz.patch)

2012-02-29 Thread Ronald van Haren
Date: Wednesday, February 29, 2012 @ 05:26:26
  Author: ronald
Revision: 151646

upgpkg: gnuplot 4.4.4-2

fix lua/tikz terminal, upstream bug 3441899

Added:
  gnuplot/trunk/lua_tikz.patch
Modified:
  gnuplot/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 lua_tikz.patch |   10 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-29 07:23:26 UTC (rev 151645)
+++ PKGBUILD2012-02-29 10:26:26 UTC (rev 151646)
@@ -5,7 +5,7 @@
 
 pkgname=gnuplot 
 pkgver=4.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and 
others" 
 arch=('i686' 'x86_64') 
 url="http://www.gnuplot.info"; 
@@ -13,12 +13,17 @@
 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";)
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";
+   "lua_tikz.patch")
+sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
+  'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
 
 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
 

Added: lua_tikz.patch
===
--- lua_tikz.patch  (rev 0)
+++ lua_tikz.patch  2012-02-29 10:26:26 UTC (rev 151646)
@@ -0,0 +1,10 @@
+--- 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