[arch-commits] Commit in btanks/repos (16 files)
Felix Yan
fyan at archlinux.org
Sun Dec 6 22:41:18 UTC 2015
Date: Sunday, December 6, 2015 @ 23:41:17
Author: fyan
Revision: 149302
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
btanks/repos/community-staging-i686/
btanks/repos/community-staging-i686/PKGBUILD
(from rev 149299, btanks/trunk/PKGBUILD)
btanks/repos/community-staging-i686/btanks.install
(from rev 149299, btanks/trunk/btanks.install)
btanks/repos/community-staging-i686/btanks_desktop
(from rev 149299, btanks/trunk/btanks_desktop)
btanks/repos/community-staging-i686/btanks_script
(from rev 149300, btanks/trunk/btanks_script)
btanks/repos/community-staging-i686/bted_script
(from rev 149300, btanks/trunk/bted_script)
btanks/repos/community-staging-i686/gcc-4.6.patch
(from rev 149300, btanks/trunk/gcc-4.6.patch)
btanks/repos/community-staging-i686/lua52.patch
(from rev 149300, btanks/trunk/lua52.patch)
btanks/repos/community-staging-x86_64/
btanks/repos/community-staging-x86_64/PKGBUILD
(from rev 149300, btanks/trunk/PKGBUILD)
btanks/repos/community-staging-x86_64/btanks.install
(from rev 149300, btanks/trunk/btanks.install)
btanks/repos/community-staging-x86_64/btanks_desktop
(from rev 149300, btanks/trunk/btanks_desktop)
btanks/repos/community-staging-x86_64/btanks_script
(from rev 149300, btanks/trunk/btanks_script)
btanks/repos/community-staging-x86_64/bted_script
(from rev 149300, btanks/trunk/bted_script)
btanks/repos/community-staging-x86_64/gcc-4.6.patch
(from rev 149300, btanks/trunk/gcc-4.6.patch)
btanks/repos/community-staging-x86_64/lua52.patch
(from rev 149300, btanks/trunk/lua52.patch)
-----------------------------------------+
community-staging-i686/PKGBUILD | 79 ++++++++++++++++++++++++++++++
community-staging-i686/btanks.install | 7 ++
community-staging-i686/btanks_desktop | 10 +++
community-staging-i686/btanks_script | 6 ++
community-staging-i686/bted_script | 6 ++
community-staging-i686/gcc-4.6.patch | 70 ++++++++++++++++++++++++++
community-staging-i686/lua52.patch | 21 +++++++
community-staging-x86_64/PKGBUILD | 79 ++++++++++++++++++++++++++++++
community-staging-x86_64/btanks.install | 7 ++
community-staging-x86_64/btanks_desktop | 10 +++
community-staging-x86_64/btanks_script | 6 ++
community-staging-x86_64/bted_script | 6 ++
community-staging-x86_64/gcc-4.6.patch | 70 ++++++++++++++++++++++++++
community-staging-x86_64/lua52.patch | 21 +++++++
14 files changed, 398 insertions(+)
Copied: btanks/repos/community-staging-i686/PKGBUILD (from rev 149299, btanks/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_ com>
+
+pkgname=btanks
+pkgver=0.9.8083
+pkgrel=7
+pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes."
+arch=('i686' 'x86_64')
+url="http://btanks.sourceforge.net"
+license=('GPL')
+depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image'
+ 'smpeg' 'glu' "btanks-data=$pkgver")
+makedepends=('scons' 'chrpath' 'mesa')
+source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2
+ btanks_desktop
+ btanks_script
+ bted_script
+ gcc-4.6.patch
+ lua52.patch)
+install=btanks.install
+md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12'
+ 'a2ddeb1e79dff8d3fd702984c8d3aab5'
+ '07657cfa71b1de1d008cc5e3ade9749b'
+ '91a61c0f581ea27281bdaecb7a3cd58b'
+ 'b816c5f3ae2d6cd954c15569d4baf123'
+ 'e7af4af59255166bee530cbabd953226')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i '1,1i#include <sys/types.h>' mrt/base_file.h
+ patch -p1 <$srcdir/gcc-4.6.patch
+ patch -p1 <$srcdir/lua52.patch
+
+ python2 engine/sl08/sl08.py >engine/sl08/sl08.h
+ scons
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ mkdir -p $pkgdir/usr/share/btanks
+ cp *.so btanks bted $pkgdir/usr/share/btanks/
+
+ # Install script
+ install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted
+ install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks
+
+ # Install desktop file
+ install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop
+
+ # Install icon
+ install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png
+
+ # Make settings saveable
+ touch $pkgdir/usr/share/btanks/bt.xml
+ chown :games $pkgdir/usr/share/btanks/bt.xml
+ chmod 664 $pkgdir/usr/share/btanks/bt.xml
+
+ # move executables, fix rpath
+ cd $pkgdir/usr/share/btanks
+ mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/btanks
+
+ mv btanks $pkgdir/usr/bin/btanks-bin
+ mv bted $pkgdir/usr/bin/bted-bin
+ mv *.so $pkgdir/usr/lib/btanks/
+
+ ln -s /usr/bin/btanks-bin ./btanks
+ ln -s /usr/bin/bted-bin ./bted
+
+ ls -1 $pkgdir/usr/lib/btanks/ | while read A; do
+ ln -s /usr/lib/btanks/$A ./$A
+ done
+
+ chrpath -d $pkgdir/usr/bin/bted-bin
+ chrpath -d $pkgdir/usr/bin/btanks-bin
+ chrpath -d $pkgdir/usr/lib/btanks/*.so
+}
Copied: btanks/repos/community-staging-i686/btanks.install (from rev 149299, btanks/trunk/btanks.install)
===================================================================
--- community-staging-i686/btanks.install (rev 0)
+++ community-staging-i686/btanks.install 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,7 @@
+post_install() {
+ echo "In order to be able to change game preferences, you must be in the 'games' group."
+}
+
+post_upgrade() {
+ echo "In order to be able to change game preferences, you must be in the 'games' group."
+}
Copied: btanks/repos/community-staging-i686/btanks_desktop (from rev 149299, btanks/trunk/btanks_desktop)
===================================================================
--- community-staging-i686/btanks_desktop (rev 0)
+++ community-staging-i686/btanks_desktop 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Battle Tanks!
+Comment= A 2D arcade tank battle!
+Icon=btanks
+Exec=btanks
+Terminal=false
+StartupNotify=false
+Categories=Game;ArcadeGame;
Copied: btanks/repos/community-staging-i686/btanks_script (from rev 149300, btanks/trunk/btanks_script)
===================================================================
--- community-staging-i686/btanks_script (rev 0)
+++ community-staging-i686/btanks_script 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,6 @@
+#!/bin/bash
+#This is the script for running the actual btanks executable
+
+cd /usr/share/btanks/
+export LD_LIBRARY_PATH=/usr/lib/btanks
+exec ./btanks
Copied: btanks/repos/community-staging-i686/bted_script (from rev 149300, btanks/trunk/bted_script)
===================================================================
--- community-staging-i686/bted_script (rev 0)
+++ community-staging-i686/bted_script 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,6 @@
+#!/bin/bash
+#This is the script for running the actual bted executable
+
+cd /usr/share/btanks/
+export LD_LIBRARY_PATH=/usr/lib/btanks
+exec ./bted
Copied: btanks/repos/community-staging-i686/gcc-4.6.patch (from rev 149300, btanks/trunk/gcc-4.6.patch)
===================================================================
--- community-staging-i686/gcc-4.6.patch (rev 0)
+++ community-staging-i686/gcc-4.6.patch 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,70 @@
+diff -wbBur btanks-0.9.8083/engine/sl08/sl08.py btanks-0.9.8083.my/engine/sl08/sl08.py
+--- btanks-0.9.8083/engine/sl08/sl08.py 2008-08-13 13:10:45.000000000 +0400
++++ btanks-0.9.8083.my/engine/sl08/sl08.py 2012-11-15 18:04:44.002524495 +0400
+@@ -152,11 +152,11 @@
+ typedef base_signalXXX %s signal_type;
+ typedef return_type (object_type::*func_t) %s;
+
+- inline slotXXX () : object(NULL), func(NULL) {}
+- inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slotXXX () : object(0), func(0) {}
++ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+
+ inline return_type operator() %s const {
+ return (object->*func) %s ;
+@@ -175,7 +175,9 @@
+ self.template_declaration('slot'),
+ self.template_parameters('base-slot'),
+ self.template_parameters('base-slot'),
+- self.prototype(True), self.prototype(True), self.prototype(False),
++ self.prototype(True),
++ self.template_parameters('base-signal'),
++ self.prototype(True), self.prototype(False),
+ )
+
+ #specialized version of the slot
+@@ -187,10 +189,10 @@
+ typedef base_signalXXX %s signal_type;
+ typedef void (object_type::*func_t) %s ;
+
+- inline slotXXX () : object(NULL), func(NULL) {}
++ inline slotXXX () : object(0), func(0) {}
+ inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+
+ inline void operator() %s const {
+ (object->*func) %s;
+@@ -206,6 +208,7 @@
+ self.template_parameters('base-slot', True),
+ self.template_parameters('base-slot', True),
+ self.prototype(True),
++ self.template_parameters('base-slot', True),
+ self.prototype(True),
+ self.prototype(False),
+ )
+diff -wbBur btanks-0.9.8083/math/range_list.h btanks-0.9.8083.my/math/range_list.h
+--- btanks-0.9.8083/math/range_list.h 2008-10-24 18:15:55.000000000 +0400
++++ btanks-0.9.8083.my/math/range_list.h 2012-11-15 18:11:52.049236706 +0400
+@@ -53,14 +53,14 @@
+ return;
+ }
+
+- typename parent_type::iterator i = lower_bound(value);
++ typename parent_type::iterator i = std::map<const T, T>::lower_bound(value);
+ if (i != parent_type::end()) {
+ if (i->first == value)
+ return;
+
+ if (value + 1 == i->first) {
+ T e = i->second;
+- erase(i);
++ std::map<const T, T>::erase(i);
+ i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ i = pack_left(i);
+ }
Copied: btanks/repos/community-staging-i686/lua52.patch (from rev 149300, btanks/trunk/lua52.patch)
===================================================================
--- community-staging-i686/lua52.patch (rev 0)
+++ community-staging-i686/lua52.patch 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,21 @@
+diff -wbBur btanks-0.9.8083/engine/luaxx/state.cpp btanks-0.9.8083.my/engine/luaxx/state.cpp
+--- btanks-0.9.8083/engine/luaxx/state.cpp 2008-06-08 13:02:39.000000000 +0400
++++ btanks-0.9.8083.my/engine/luaxx/state.cpp 2012-11-15 18:59:07.000000000 +0400
+@@ -59,7 +59,7 @@
+ void State::load(const std::string &fname, const mrt::Chunk &data) {
+ //throw_ex(("implement me[%s]", fname.c_str()));
+ reader_state x(data);
+- int err = lua_load(state, chunk_reader, &x, fname.c_str());
++ int err = lua_load(state, chunk_reader, &x, fname.c_str(), NULL);
+ check_error(state, err);
+ }
+
+@@ -81,7 +81,7 @@
+ assert(state == NULL);
+
+ //state = lua_newstate(l_alloc, this);
+- state = lua_open();
++ state = luaL_newstate();
+ if (state == NULL)
+ throw_ex(("cannot create lua interpreter"));
+
Copied: btanks/repos/community-staging-x86_64/PKGBUILD (from rev 149300, btanks/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Nick B <Shirakawasuna at gmail _dot_ com>
+
+pkgname=btanks
+pkgver=0.9.8083
+pkgrel=7
+pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes."
+arch=('i686' 'x86_64')
+url="http://btanks.sourceforge.net"
+license=('GPL')
+depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image'
+ 'smpeg' 'glu' "btanks-data=$pkgver")
+makedepends=('scons' 'chrpath' 'mesa')
+source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2
+ btanks_desktop
+ btanks_script
+ bted_script
+ gcc-4.6.patch
+ lua52.patch)
+install=btanks.install
+md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12'
+ 'a2ddeb1e79dff8d3fd702984c8d3aab5'
+ '07657cfa71b1de1d008cc5e3ade9749b'
+ '91a61c0f581ea27281bdaecb7a3cd58b'
+ 'b816c5f3ae2d6cd954c15569d4baf123'
+ 'e7af4af59255166bee530cbabd953226')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i '1,1i#include <sys/types.h>' mrt/base_file.h
+ patch -p1 <$srcdir/gcc-4.6.patch
+ patch -p1 <$srcdir/lua52.patch
+
+ python2 engine/sl08/sl08.py >engine/sl08/sl08.h
+ scons
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ mkdir -p $pkgdir/usr/share/btanks
+ cp *.so btanks bted $pkgdir/usr/share/btanks/
+
+ # Install script
+ install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted
+ install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks
+
+ # Install desktop file
+ install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop
+
+ # Install icon
+ install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png
+
+ # Make settings saveable
+ touch $pkgdir/usr/share/btanks/bt.xml
+ chown :games $pkgdir/usr/share/btanks/bt.xml
+ chmod 664 $pkgdir/usr/share/btanks/bt.xml
+
+ # move executables, fix rpath
+ cd $pkgdir/usr/share/btanks
+ mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/btanks
+
+ mv btanks $pkgdir/usr/bin/btanks-bin
+ mv bted $pkgdir/usr/bin/bted-bin
+ mv *.so $pkgdir/usr/lib/btanks/
+
+ ln -s /usr/bin/btanks-bin ./btanks
+ ln -s /usr/bin/bted-bin ./bted
+
+ ls -1 $pkgdir/usr/lib/btanks/ | while read A; do
+ ln -s /usr/lib/btanks/$A ./$A
+ done
+
+ chrpath -d $pkgdir/usr/bin/bted-bin
+ chrpath -d $pkgdir/usr/bin/btanks-bin
+ chrpath -d $pkgdir/usr/lib/btanks/*.so
+}
Copied: btanks/repos/community-staging-x86_64/btanks.install (from rev 149300, btanks/trunk/btanks.install)
===================================================================
--- community-staging-x86_64/btanks.install (rev 0)
+++ community-staging-x86_64/btanks.install 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,7 @@
+post_install() {
+ echo "In order to be able to change game preferences, you must be in the 'games' group."
+}
+
+post_upgrade() {
+ echo "In order to be able to change game preferences, you must be in the 'games' group."
+}
Copied: btanks/repos/community-staging-x86_64/btanks_desktop (from rev 149300, btanks/trunk/btanks_desktop)
===================================================================
--- community-staging-x86_64/btanks_desktop (rev 0)
+++ community-staging-x86_64/btanks_desktop 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Battle Tanks!
+Comment= A 2D arcade tank battle!
+Icon=btanks
+Exec=btanks
+Terminal=false
+StartupNotify=false
+Categories=Game;ArcadeGame;
Copied: btanks/repos/community-staging-x86_64/btanks_script (from rev 149300, btanks/trunk/btanks_script)
===================================================================
--- community-staging-x86_64/btanks_script (rev 0)
+++ community-staging-x86_64/btanks_script 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,6 @@
+#!/bin/bash
+#This is the script for running the actual btanks executable
+
+cd /usr/share/btanks/
+export LD_LIBRARY_PATH=/usr/lib/btanks
+exec ./btanks
Copied: btanks/repos/community-staging-x86_64/bted_script (from rev 149300, btanks/trunk/bted_script)
===================================================================
--- community-staging-x86_64/bted_script (rev 0)
+++ community-staging-x86_64/bted_script 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,6 @@
+#!/bin/bash
+#This is the script for running the actual bted executable
+
+cd /usr/share/btanks/
+export LD_LIBRARY_PATH=/usr/lib/btanks
+exec ./bted
Copied: btanks/repos/community-staging-x86_64/gcc-4.6.patch (from rev 149300, btanks/trunk/gcc-4.6.patch)
===================================================================
--- community-staging-x86_64/gcc-4.6.patch (rev 0)
+++ community-staging-x86_64/gcc-4.6.patch 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,70 @@
+diff -wbBur btanks-0.9.8083/engine/sl08/sl08.py btanks-0.9.8083.my/engine/sl08/sl08.py
+--- btanks-0.9.8083/engine/sl08/sl08.py 2008-08-13 13:10:45.000000000 +0400
++++ btanks-0.9.8083.my/engine/sl08/sl08.py 2012-11-15 18:04:44.002524495 +0400
+@@ -152,11 +152,11 @@
+ typedef base_signalXXX %s signal_type;
+ typedef return_type (object_type::*func_t) %s;
+
+- inline slotXXX () : object(NULL), func(NULL) {}
+- inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slotXXX () : object(0), func(0) {}
++ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+
+ inline return_type operator() %s const {
+ return (object->*func) %s ;
+@@ -175,7 +175,9 @@
+ self.template_declaration('slot'),
+ self.template_parameters('base-slot'),
+ self.template_parameters('base-slot'),
+- self.prototype(True), self.prototype(True), self.prototype(False),
++ self.prototype(True),
++ self.template_parameters('base-signal'),
++ self.prototype(True), self.prototype(False),
+ )
+
+ #specialized version of the slot
+@@ -187,10 +189,10 @@
+ typedef base_signalXXX %s signal_type;
+ typedef void (object_type::*func_t) %s ;
+
+- inline slotXXX () : object(NULL), func(NULL) {}
++ inline slotXXX () : object(0), func(0) {}
+ inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; base_slotXXX%s::connect(signal_ref); }
+
+ inline void operator() %s const {
+ (object->*func) %s;
+@@ -206,6 +208,7 @@
+ self.template_parameters('base-slot', True),
+ self.template_parameters('base-slot', True),
+ self.prototype(True),
++ self.template_parameters('base-slot', True),
+ self.prototype(True),
+ self.prototype(False),
+ )
+diff -wbBur btanks-0.9.8083/math/range_list.h btanks-0.9.8083.my/math/range_list.h
+--- btanks-0.9.8083/math/range_list.h 2008-10-24 18:15:55.000000000 +0400
++++ btanks-0.9.8083.my/math/range_list.h 2012-11-15 18:11:52.049236706 +0400
+@@ -53,14 +53,14 @@
+ return;
+ }
+
+- typename parent_type::iterator i = lower_bound(value);
++ typename parent_type::iterator i = std::map<const T, T>::lower_bound(value);
+ if (i != parent_type::end()) {
+ if (i->first == value)
+ return;
+
+ if (value + 1 == i->first) {
+ T e = i->second;
+- erase(i);
++ std::map<const T, T>::erase(i);
+ i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ i = pack_left(i);
+ }
Copied: btanks/repos/community-staging-x86_64/lua52.patch (from rev 149300, btanks/trunk/lua52.patch)
===================================================================
--- community-staging-x86_64/lua52.patch (rev 0)
+++ community-staging-x86_64/lua52.patch 2015-12-06 22:41:17 UTC (rev 149302)
@@ -0,0 +1,21 @@
+diff -wbBur btanks-0.9.8083/engine/luaxx/state.cpp btanks-0.9.8083.my/engine/luaxx/state.cpp
+--- btanks-0.9.8083/engine/luaxx/state.cpp 2008-06-08 13:02:39.000000000 +0400
++++ btanks-0.9.8083.my/engine/luaxx/state.cpp 2012-11-15 18:59:07.000000000 +0400
+@@ -59,7 +59,7 @@
+ void State::load(const std::string &fname, const mrt::Chunk &data) {
+ //throw_ex(("implement me[%s]", fname.c_str()));
+ reader_state x(data);
+- int err = lua_load(state, chunk_reader, &x, fname.c_str());
++ int err = lua_load(state, chunk_reader, &x, fname.c_str(), NULL);
+ check_error(state, err);
+ }
+
+@@ -81,7 +81,7 @@
+ assert(state == NULL);
+
+ //state = lua_newstate(l_alloc, this);
+- state = lua_open();
++ state = luaL_newstate();
+ if (state == NULL)
+ throw_ex(("cannot create lua interpreter"));
+
More information about the arch-commits
mailing list