update

3 files changed, 34 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c64981760c76..af7f9709c1c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Feb 22 06:37:07 UTC 2017
 pkgbase = onscripter-jh-hg
 	pkgdesc = onscripter fork with custom improvements.
-	pkgver = 74
+	pkgver = 85+
 	pkgrel = 1
 	url = https://bitbucket.org/jh10001/onscripter-jh
 	arch = i686
@@ -15,10 +17,13 @@ pkgbase = onscripter-jh-hg
 	depends = libjpeg-turbo
 	depends = bzip2
 	depends = libvorbis
+	depends = lua51
 	provides = onscripter-jh
 	conflicts = onscripter-jh
-	source = hg+https://bitbucket.org/jh10001/onscripter-jh#SDL2
+	source = hg+https://bitbucket.org/jh10001/onscripter-jh
+	source = lua_include.patch
 	md5sums = SKIP
+	md5sums = 20381fb167dce476414230c7f1ecd1e3
 
 pkgname = onscripter-jh-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index c378b739a10f..092c3d3cf746 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,41 @@
 # Maintainer: maz-1 <loveayawaka at gmail dot com>
 _pkgname=onscripter-jh
 pkgname=${_pkgname}-hg
-pkgver=74
+pkgver=85+
 pkgrel=1
 pkgdesc="onscripter fork with custom improvements."
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/jh10001/onscripter-jh"
 license=('GPL3')
-depends=('sdl2' 'sdl2_mixer' 'sdl2_ttf' 'sdl2_image' 'smpeg' 'libjpeg-turbo' 'bzip2' 'libvorbis')
+depends=('sdl2' 'sdl2_mixer' 'sdl2_ttf' 'sdl2_image' 'smpeg' 'libjpeg-turbo' 'bzip2' 'libvorbis' 'lua51')
 makedepends=('mercurial')
 conflicts=('onscripter-jh')
 provides=('onscripter-jh')
-source=("hg+https://bitbucket.org/jh10001/$_pkgname")
-md5sums=('SKIP')
+source=("hg+https://bitbucket.org/jh10001/${_pkgname}" lua_include.patch)
+md5sums=('SKIP' '20381fb167dce476414230c7f1ecd1e3')
 pkgver() {
   cd $srcdir/$_pkgname
   hg id -n
 }
 
-build() {
+prepare() {
     cd $srcdir/$_pkgname
     hg update SDL2
-    echo 'LIBS = `sdl2-config --libs` `smpeg-config --libs` -lSDL2_ttf -lSDL2_image -lSDL2_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile
-CFLAGS += -c `sdl2-config --cflags` `smpeg-config --cflags` -DLINUX -DUSE_OGG_VORBIS -std=c++11 -DUSE_SDL_RENDERER
+    echo 'LIBS = `sdl2-config --libs` `smpeg-config --libs` -lSDL2_ttf -lSDL2_image -lSDL2_mixer -lbz2 -ljpeg -lm -logg -lvorbis -lvorbisfile -llua5.1
+CFLAGS += -c `sdl2-config --cflags` `smpeg-config --cflags` -DLINUX -DUSE_OGG_VORBIS -std=c++11 -DUSE_SDL_RENDERER -DUSE_LUA -DUTF8_CAPTION
 OBJSUFFIX = .o
+EXT_OBJS += LUAHandler$(OBJSUFFIX)
 CC = g++
 LD = g++ -o
-TARGET = onscripter
+TARGET = onscripter 
+#sardec nsadec sarconv nsaconv
 include Makefile.onscripter' > Makefile
+    patch -p1 < "$srcdir/lua_include.patch"
+}
+
+build() {
+    cd $srcdir/$_pkgname
     make
-    
 }
 
 package() {
diff --git a/lua_include.patch b/lua_include.patch
new file mode 100644
index 000000000000..85ad128abb96
--- /dev/null
+++ b/lua_include.patch
@@ -0,0 +1,12 @@
+diff -Naur a/LUAHandler.h b/LUAHandler.h
+--- a/LUAHandler.h	2017-02-22 14:18:12.000000000 +0800
++++ b/LUAHandler.h	2017-02-22 14:19:04.074271940 +0800
+@@ -24,7 +24,7 @@
+ #if !defined(__LUA_HANDLER_H__) && defined(USE_LUA)
+ #define __LUA_HANDLER_H__
+ 
+-#include <lua.hpp>
++#include <lua5.1/lua.hpp>
+ 
+ class ONScripter;
+ class ScriptHandler;