fix lua compile with modern lua (thanks to Rafael Fonseca)

This commit is contained in:
Tom Callaway 2015-09-14 14:42:15 -04:00 committed by Dan Horák
parent 32f016f1ea
commit ac88402b05
2 changed files with 20 additions and 1 deletions

12
efl-1.15.1-fixlua.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c.fixlua efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c
--- efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c.fixlua 2015-09-14 14:27:24.317751813 -0400
+++ efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c 2015-09-14 14:26:51.541956262 -0400
@@ -2431,7 +2431,7 @@ _lua_backtrace(lua_State *L)
if (!lua_isstring(L, 1)) /* 'message' not a string? */
return 1; /* keep it intact */
ERR("Lua error: %s", lua_tolstring(L, 1, NULL));
- lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+ lua_getglobal(L, "debug");
if (!lua_istable(L, -1))
{
lua_pop(L, 1);

View File

@ -13,13 +13,16 @@
Name: efl
Version: 1.15.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib
URL: http://enlightenment.org/
Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
# I think this one is Fedora specific.
Patch0: efl-1.11.4-tslibfix.patch
# Fix lua compilation with lua 5.2+
# https://phab.enlightenment.org/T2728
Patch1: efl-1.15.1-fixlua.patch
BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel
BuildRequires: gstreamer1-plugins-base-devel libtiff-devel openssl-devel
BuildRequires: curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel
@ -151,6 +154,7 @@ Development files for EFL.
%prep
%setup -q
%patch0 -p1 -b .tslibfix
%patch1 -p1 -b .fixlua
autoreconf -ifv
# This is why hardcoding paths is bad.
@ -466,6 +470,9 @@ fi
%{_libdir}/pkgconfig/evas*.pc
%changelog
* Mon Sep 14 2015 Tom Callaway <spot@fedoraproject.org> - 1.15.1-2
- fix compilation against current lua (thanks to Rafael Fonseca)
* Fri Aug 28 2015 Tom Callaway <spot@fedoraproject.org> - 1.15.1-1
- update to 1.15.1