[fawkes] lua 5.2
Tom Callaway
spot at fedoraproject.org
Tue May 14 20:29:09 UTC 2013
commit c25b2eac47df10f00d8f603e404c13bb8bfcd3d9
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue May 14 16:28:42 2013 -0400
lua 5.2
.gitignore | 1 -
fawkes-0.5.0-lua-5.2.patch | 28 ++++++++++++++++++++++++++++
fawkes.spec | 7 ++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0f4ca7..9ee8f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/fawkes-0.5.0*
.build*
/*.src.rpm
/noarch
diff --git a/fawkes-0.5.0-lua-5.2.patch b/fawkes-0.5.0-lua-5.2.patch
new file mode 100644
index 0000000..87e5c81
--- /dev/null
+++ b/fawkes-0.5.0-lua-5.2.patch
@@ -0,0 +1,28 @@
+diff -up fawkes-0.5.0/src/libs/lua/context.cpp.lua-52 fawkes-0.5.0/src/libs/lua/context.cpp
+--- fawkes-0.5.0/src/libs/lua/context.cpp.lua-52 2013-05-14 16:20:36.579372089 -0400
++++ fawkes-0.5.0/src/libs/lua/context.cpp 2013-05-14 16:21:45.632373125 -0400
+@@ -34,6 +34,15 @@
+ #include <cstring>
+ #include <unistd.h>
+
++#ifndef lua_objlen
++#define lua_objlen(L,i) lua_rawlen(L, (i))
++#endif
++
++#if LUA_VERSION_NUM < 502
++# define lua_getuservalue lua_getfenv
++# define lua_setuservalue lua_setfenv
++#endif
++
+ namespace fawkes {
+ #if 0 /* just to make Emacs auto-indent happy */
+ }
+@@ -1203,7 +1212,7 @@ LuaContext::objlen(int idx)
+ void
+ LuaContext::setfenv(int idx)
+ {
+- lua_setfenv(__L, idx);
++ lua_setuservalue(__L, idx);
+ }
+
+
diff --git a/fawkes.spec b/fawkes.spec
index 495a237..0b924ac 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -1,6 +1,6 @@
Name: fawkes
Version: 0.5.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Robot Software Framework
Group: Applications/System
@@ -11,6 +11,7 @@ Source0: http://files.fawkesrobotics.org/releases/%{name}-%{version}.tar.
# This patch adds the new argument in calls to agread
Patch0: %{name}-0.5.0-graphviz.patch
Patch1: %{name}-0.5.0-v4lkernel.patch
+Patch2: fawkes-0.5.0-lua-5.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++, make >= 3.81
@@ -459,6 +460,7 @@ functionality.
%patch0 -p0 -b .graphviz
%patch1 -p0 -b .v4lkernel
%endif
+%patch2 -p1 -b .lua-52
%build
%define feature_flags HAVE_ROS=0 HAVE_OPENRAVE=0
@@ -835,6 +837,9 @@ rm -rf %{buildroot}
%{_datadir}/doc/%{name}-%{version}
%changelog
+* Tue May 14 2013 Tom Callaway <spot at fedoraproject.org> - 0.5.0-8
+- rebuild for lua 5.2
+
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.5.0-7
- Rebuild for Boost-1.53.0
More information about the scm-commits
mailing list