rpms/celestia/devel celestia-1.4.1-lua51-resume.patch, NONE, 1.1 celestia-1.4.1-lua51.patch, NONE, 1.1 celestia.spec, 1.16, 1.17
Steven Pritchard (steve)
fedora-extras-commits at redhat.com
Mon Jul 31 16:57:46 UTC 2006
Author: steve
Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3458
Modified Files:
celestia.spec
Added Files:
celestia-1.4.1-lua51-resume.patch celestia-1.4.1-lua51.patch
Log Message:
Various changes from Nick Urbanik (bug #200696).
celestia-1.4.1-lua51-resume.patch:
--- NEW FILE celestia-1.4.1-lua51-resume.patch ---
--- celestia-1.4.1/src/celestia/celx.cpp-after-patch1 2006-07-31 09:06:13.000000000 +1000
+++ celestia-1.4.1/src/celestia/celx.cpp 2006-07-31 09:05:08.000000000 +1000
@@ -530,6 +530,8 @@
status = lua_resume(co, narg);
if (status == 0)
+ return 0;
+ else if (status == LUA_YIELD)
{
int nres = lua_gettop(co);
#if 0
@@ -541,7 +543,7 @@
}
else
{
- lua_xmove(co, L, 1); // move error message
+ lua_xmove(co, L, -1); // move error message
return -1; // error flag
}
}
@@ -711,7 +713,8 @@
// no other errors, and execution terminates normally. There
// should be a better way to figure out whether the script ended
// normally . . .
- if (strcmp(errorMessage, "cannot resume dead coroutine") != 0)
+ if (errorMessage
+ && strcmp(errorMessage, "cannot resume dead coroutine") != 0)
{
cout << "Error: " << errorMessage << '\n';
CelestiaCore* appCore = getAppCore(co);
celestia-1.4.1-lua51.patch:
--- NEW FILE celestia-1.4.1-lua51.patch ---
diff -wbBur celestia-1.4.1/configure celestia-1.4.1.my/configure
--- celestia-1.4.1/configure 2006-02-16 00:53:09.000000000 +0300
+++ celestia-1.4.1.my/configure 2006-06-03 13:40:37.000000000 +0400
@@ -39509,7 +39509,7 @@
echo $ECHO_N "checking whether to enable Celestia Extension Language... $ECHO_C" >&6
if (test "$enable_lua" != "no"); then
CXXFLAGS="$CXXFLAGS -DCELX"
- LDFLAGS="$LDFLAGS -llualib -llua"
+ LDFLAGS="$LDFLAGS -llua"
if (test "$lua_includes" != "no"); then
CXXFLAGS="$CXXFLAGS -I$lua_includes"
diff -wbBur celestia-1.4.1/configure.in celestia-1.4.1.my/configure.in
--- celestia-1.4.1/configure.in 2006-02-03 21:09:54.000000000 +0300
+++ celestia-1.4.1.my/configure.in 2006-06-03 13:40:28.000000000 +0400
@@ -383,7 +383,7 @@
AC_MSG_CHECKING([whether to enable Celestia Extension Language])
if (test "$enable_lua" != "no"); then
CXXFLAGS="$CXXFLAGS -DCELX"
- LDFLAGS="$LDFLAGS -llualib -llua"
+ LDFLAGS="$LDFLAGS -llua"
if (test "$lua_includes" != "no"); then
CXXFLAGS="$CXXFLAGS -I$lua_includes"
diff -wbBur celestia-1.4.1/src/celestia/celx.cpp celestia-1.4.1.my/src/celestia/celx.cpp
--- celestia-1.4.1/src/celestia/celx.cpp 2006-01-07 03:01:51.000000000 +0300
+++ celestia-1.4.1.my/src/celestia/celx.cpp 2006-06-03 13:41:36.000000000 +0400
@@ -32,9 +32,7 @@
#include "celx.h"
#include "celestiacore.h"
-extern "C" {
-#include "lualib.h"
-}
+#include "lua.hpp"
using namespace std;
@@ -598,7 +596,7 @@
int stackTop = lua_gettop(costate);
if (strcmp(c_p, "y") == 0)
{
- lua_iolibopen(costate);
+ luaL_openlibs(costate);
ioMode = IOAllowed;
}
else
@@ -4577,10 +4575,7 @@
initMaps();
// Import the base and math libraries
- lua_baselibopen(state);
- lua_mathlibopen(state);
- lua_tablibopen(state);
- lua_strlibopen(state);
+ luaL_openlibs(state);
// Add an easy to use wait function, so that script writers can
// live in ignorance of coroutines. There will probably be a significant
Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- celestia.spec 19 May 2006 20:45:29 -0000 1.16
+++ celestia.spec 31 Jul 2006 16:57:46 -0000 1.17
@@ -1,12 +1,14 @@
Name: celestia
Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: OpenGL real-time visual space simulation
Group: Amusements/Graphics
License: GPL
Source0: http://dl.sf.net/celestia/celestia-%{version}.tar.gz
Source3: celestia.desktop
Patch0: celestia-1.4.0-compile.patch
+Patch1: celestia-1.4.1-lua51.patch
+Patch2: celestia-1.4.1-lua51-resume.patch
URL: http://www.shatters.net/celestia/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +21,7 @@
BuildRequires: libGLU-devel
BuildRequires: libXt-devel
BuildRequires: libXmu-devel
+BuildRequires: lua-devel
Requires(post): GConf2
Requires(preun): GConf2
@@ -39,10 +42,12 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1 -b .lua51
+%patch2 -p1 -b .lua51-resume
%build
export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-%configure --with-gnome
+%configure --with-gnome --with-lua
make %{?_smp_mflags}
@@ -91,7 +96,8 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO controls.txt
+%doc AUTHORS ChangeLog COPYING README TODO controls.txt coding-standards.html
+%doc devguide.txt
# Seem to have gone away in post-1.4.0 CVS...
#%doc manual/*.html manual/*.css
%{_bindir}/*
@@ -102,6 +108,17 @@
%changelog
+* Mon Jul 31 2006 Nick Urbanik <nicku at nicku.org> 1.4.1-3
+- Test errorMessage to see if it is null before copying it!
+ This change suggested by Hank Ramsey and added to
+ celestia-1.4.1-lua51-resume.patch
+- Added developers documentation
+- Incorporate patch suggested by Hank Ramsey to eliminate segfault
+ when loading .celx files: celestia-1.4.1-lua51-resume.patch
+- Update to add lua
+- Incorporate
+ http://www.archlinux.org/pipermail/tur-users/attachments/20060603/7dea8cd1/celestia-lua51.bin
+
* Fri May 19 2006 Steven Pritchard <steve at kspei.com> 1.4.1-2
- Include accidentally dropped 3ds models.
More information about the fedora-extras-commits
mailing list