utils/gnuplot: version 5.0.2

5 files changed, 39 insertions, 5 deletions

diff --git a/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch b/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
new file mode 100644
index 0000000000..79b5ef75a9
--- /dev/null
+++ b/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
@@ -0,0 +1,25 @@
+From f3f6fecea7b93934d107cea0710e95c7afc55a27 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.net>
+Date: Fri, 25 Mar 2016 10:13:17 +0100
+Subject: [PATCH] fix compatibility with lua >= 5.2
+
+---
+ term/lua/gnuplot-tikz.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/term/lua/gnuplot-tikz.lua b/term/lua/gnuplot-tikz.lua
+index a2cb684..967345c 100644
+--- a/term/lua/gnuplot-tikz.lua
++++ b/term/lua/gnuplot-tikz.lua
+@@ -1754,7 +1754,7 @@ term.options = function(opt_str, initial, t_count)
+         o_next = string.sub(opt_str, s_start+1, s_end-1)
+         if next_char == '"' then
+           -- Wow! this is to resolve all string escapes, kind of "unescape string"
+-          o_next = assert(loadstring("return(\""..o_next.."\")"))()
++          o_next = assert(load("return(\""..o_next.."\")"))()
+         end
+         o_type = "string"
+       else
+-- 
+2.7.4
+
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index fd5d26a80f..5809a04c86 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -13,7 +13,7 @@ optional_depends "readline"                                 \
                   "use gnu readline instead of builtin readline" &&
 
 optional_depends xorg-libs --with-x --without-x "X11 output" &&
-optional_depends WXWIDGET --enable-wxt --disable-wxt \
+optional_depends WXWIDGET --enable-wxwidgets --disable-wxwidgets \
                  "wxWidgets interactive terminal" &&
 
 optional_depends svgalib               \
@@ -27,8 +27,11 @@ optional_depends lua "--with-lua" "--without-lua" \
 optional_depends cairo "--with-cairo" "--without-cairo" \
                  "cairo-based terminals" &&
 
-optional_depends qt4 "--enable-qt" "--disable-qt" \
-                 "Qt-based interactive  terminal" &&
+optional_depends qt4 "--with-qt=qt4" "--without-qt" \
+                 "Qt-based interactive terminal" &&
+
+optional_depends libcerf "--with-libcerf" "--without-libcerf" \
+                 "for special functions from libcerf" &&
 
 if is_depends_enabled $SPELL wxgtk; then
   depends cairo &&
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index b31d5e97bb..038fea1a44 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -8,11 +8,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
    SOURCE_URL[0]=cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
    SOURCE_IGNORE=volatile
 else
-         VERSION=4.6.5
+         VERSION=5.0.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-     SOURCE_HASH=sha512:5a9c55d664105242aaf6356e707094a7dd5a80ba8d836bc7b3ce8836bcf5d2a57174d38220ea9efc58fa04f3c5f7d680ca5023482cff1a62b93549ff0530c47d
+     SOURCE_HASH=sha512:44fb9fcb821139f9e61d86135d31a9308c3a46f10c96d08b342b64b14c942363dbc8af4fa233cb5ef0a6743280b5bf44572cabd838192128bfd6578b583ab0f0
 fi
         WEB_SITE=http://www.gnuplot.info
          ENTERED=20020210
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index f1d391e321..347bec7bf0 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,8 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS, DEPENDS: version 5.0.2
+	* PRE_BUILD, 0001-fix-compatibility-with-lua-5.2.patch: fix compatibility
+	  with lua >= 5.2
+
 2015-12-28 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS: WXWIDGET
 
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 4e9ad8f9f0..03342b3098 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -3,6 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
 # Fix build that thinks we are cross-compiling.
 # Hopefully fixed in gnuplot 4.7 .
 patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
+patch -Np1 < "$SPELL_DIRECTORY/0001-fix-compatibility-with-lua-5.2.patch" &&
 
 if [[ $GNUPLOT_BRANCH == scm ]]; then
   cd "$SOURCE_DIRECTORY" &&