git » gnuplot.git » commit 9406438

Lua 5.3 rebuild. Enable lua 5.2 source compatibility.

author Anatol Pomozov
2015-05-06 19:48:31 UTC
committer Anatol Pomozov
2015-05-06 19:48:31 UTC
parent 13ba4d6765a9dc64c0c7ff8dbbed41fc11972e51

Lua 5.3 rebuild. Enable lua 5.2 source compatibility.

PKGBUILD +8 -4
lua53_compat.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index 8bd4460..3c170cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gnuplot
 pkgver=5.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64') 
 url="http://www.gnuplot.info" 
@@ -13,8 +13,10 @@ depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'qt5-tools' '
 makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra')
 options=('!makeflags')
 install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('ca5163e3cb466b4aeb878f1173b0fe624367f08a')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "lua53_compat.patch")
+sha1sums=('ca5163e3cb466b4aeb878f1173b0fe624367f08a'
+          '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,12 +27,14 @@ prepare() {
   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
+
+  patch -p1 < "$srcdir"/lua53_compat.patch
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-   WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
               --libexecdir=/usr/bin \
               --with-gihdir=/usr/share/gnuplot \
               --with-readline=gnu --enable-qt
diff --git a/lua53_compat.patch b/lua53_compat.patch
new file mode 100644
index 0000000..9d3be77
--- /dev/null
+++ b/lua53_compat.patch
@@ -0,0 +1,13 @@
+diff --git a/term/lua.trm b/term/lua.trm
+index af63d68..474221f 100644
+--- a/term/lua.trm
++++ b/term/lua.trm
+@@ -110,6 +110,8 @@ TERM_PUBLIC void LUA_boxed_text __PROTO((unsigned int, unsigned int, int));
+ # define LUA_EXTERNAL_IMAGES 1
+ #endif
+ 
++
++#define LUA_COMPAT_APIINTCASTS
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>