[celestia/f20] Fix startup, thanks to a patch from Chris Rankin
Richard Hughes
rhughes at fedoraproject.org
Thu Jul 3 17:37:07 UTC 2014
commit 6badd675a4c01fd0776f3edb871b63d11aa56e27
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 3 16:46:49 2014 +0100
Fix startup, thanks to a patch from Chris Rankin
celestia-lua-52-fix.patch | 16 ++++++++++++++++
celestia.spec | 8 +++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/celestia-lua-52-fix.patch b/celestia-lua-52-fix.patch
new file mode 100644
index 0000000..62e26ce
--- /dev/null
+++ b/celestia-lua-52-fix.patch
@@ -0,0 +1,16 @@
+--- celestia-1.6.1.orig/src/celestia/celx.cpp 2014-02-09 23:23:10.308810741 +0000
++++ celestia-1.6.1/src/celestia/celx.cpp 2014-02-09 23:24:57.627017784 +0000
+@@ -272,9 +272,13 @@
+ const char* name,
+ lua_CFunction func)
+ {
++#if LUA_VER >= 0x050200
++ luaL_requiref(l, name, func, 1);
++#else
+ lua_pushcfunction(l, func);
+ lua_pushstring(l, name);
+ lua_call(l, 1, 0);
++#endif
+ }
+ #endif
+
diff --git a/celestia.spec b/celestia.spec
index edee968..a211e7c 100644
--- a/celestia.spec
+++ b/celestia.spec
@@ -1,6 +1,6 @@
Name: celestia
Version: 1.6.1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: OpenGL real-time visual space simulation
Group: Applications/Emulators
License: GPLv2+
@@ -40,6 +40,7 @@ Patch0: celestia-1.6.1-gcc47.patch
Patch1: celestia-1.6.1-zlib.patch
Patch2: celestia-1.6.1-lua-5.2.patch
Patch3: celestia-1.6.1-gcc48.patch
+Patch4: celestia-lua-52-fix.patch
BuildRequires: zlib-devel
BuildRequires: gtkglext-devel
BuildRequires: libgnomeui-devel
@@ -76,6 +77,7 @@ object you want to visit.
%patch1 -p1 -b .zlib
%patch2 -p1 -b .lua-52
%patch3 -p1
+%patch4 -p1
# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
@@ -147,6 +149,10 @@ fi
%changelog
+* Thu Jul 03 2014 Richard Hughes <richard at hughsie.com> - 1.6.1-15
+- Fix startup, thanks to a patch from Chris Rankin
+- Resolves: #1045632
+
* Thu Aug 22 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.6.1-14
- FTBS, RHBZ#992048:
- celestia-1.6.1-lua-5.2.patch: Add autoconf-2.67 generated snippets.
More information about the scm-commits
mailing list