svn commit: r374703 - in head/astro/celestia: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Dec 14 13:23:37 UTC 2014
Author: danfe
Date: Sun Dec 14 13:23:35 2014
New Revision: 374703
URL: https://svnweb.freebsd.org/changeset/ports/374703
QAT: https://qat.redports.org/buildarchive/r374703/
Log:
Pull another patch from Red Hat, to fix a runtime crash:
PANIC: unprotected error in call to Lua API (attempt to index a nil value)
PR: 195240
Red Hat bug: https://bugzilla.redhat.com/show_bug.cgi?id=1045632
Patch by: Chris Rankin (Comments 13-16)
Obtained from: celestia-1.6.1-15.fc20.src.rpm
Added:
head/astro/celestia/files/celestia-lua-52-fix.patch (contents, props changed)
Modified:
head/astro/celestia/Makefile
Modified: head/astro/celestia/Makefile
==============================================================================
--- head/astro/celestia/Makefile Sun Dec 14 13:19:05 2014 (r374702)
+++ head/astro/celestia/Makefile Sun Dec 14 13:23:35 2014 (r374703)
@@ -3,7 +3,7 @@
PORTNAME= celestia
PORTVERSION= 1.6.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION}
PKGNAMESUFFIX= -${CELESTIA_UI}
@@ -20,6 +20,7 @@ USES= gettext gmake libtool lua pkgconf
USE_GL= gl
GNU_CONFIGURE= yes
EXTRA_PATCHES= ${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \
+ ${FILESDIR}/celestia-lua-52-fix.patch:-p1 \
${FILESDIR}/celestia-1.6.1-gcc47.patch:-p1 \
${FILESDIR}/celestia-1.6.1-gcc48.patch:-p1
Added: head/astro/celestia/files/celestia-lua-52-fix.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/celestia/files/celestia-lua-52-fix.patch Sun Dec 14 13:23:35 2014 (r374703)
@@ -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
+
More information about the svn-ports-head
mailing list