From f07a1ccf539607b7588be7974a2bd286bed648ab Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 28 Aug 2015 13:24:57 -0400 Subject: [PATCH 1/3] 1.15.1 --- efl.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index bc7f345..e322bd9 100644 --- a/efl.spec +++ b/efl.spec @@ -12,7 +12,7 @@ %global use_wayland 0 Name: efl -Version: 1.15.0 +Version: 1.15.1 Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib @@ -466,6 +466,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Fri Aug 28 2015 Tom Callaway - 1.15.1-1 +- update to 1.15.1 + * Mon Aug 10 2015 Tom Callaway - 1.15.0-1 - update to 1.15.0 diff --git a/sources b/sources index a87b1f0..94beeaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8429b7ccd4e287abf9544da378749341 efl-1.15.0.tar.xz +b7e57880566f67e3375fcd33d8143dde efl-1.15.1.tar.xz From 26671b3710b1dd16b2224f2b958252d7feda4f7a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 Sep 2015 14:42:15 -0400 Subject: [PATCH 2/3] fix lua compile with modern lua (thanks to Rafael Fonseca) --- efl-1.15.1-fixlua.patch | 12 ++++++++++++ efl.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 efl-1.15.1-fixlua.patch diff --git a/efl-1.15.1-fixlua.patch b/efl-1.15.1-fixlua.patch new file mode 100644 index 0000000..b2fcf21 --- /dev/null +++ b/efl-1.15.1-fixlua.patch @@ -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); diff --git a/efl.spec b/efl.spec index e322bd9..fe8c7c3 100644 --- a/efl.spec +++ b/efl.spec @@ -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 - 1.15.1-2 +- fix compilation against current lua (thanks to Rafael Fonseca) + * Fri Aug 28 2015 Tom Callaway - 1.15.1-1 - update to 1.15.1 From 1e67ab435043a5cddb7ffd1228665098ff56341e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 10 Nov 2015 14:03:25 -0500 Subject: [PATCH 3/3] 1.16.0 --- .gitignore | 1 + efl.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b12caf5..74d14ba 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /efl-1.14.1.tar.xz /efl-1.14.2.tar.xz /efl-1.15.0.tar.xz +/efl-1.16.0.tar.xz diff --git a/efl.spec b/efl.spec index fe8c7c3..16c6afd 100644 --- a/efl.spec +++ b/efl.spec @@ -12,17 +12,14 @@ %global use_wayland 0 Name: efl -Version: 1.15.1 -Release: 2%{?dist} +Version: 1.16.0 +Release: 1%{?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 @@ -154,7 +151,6 @@ Development files for EFL. %prep %setup -q %patch0 -p1 -b .tslibfix -%patch1 -p1 -b .fixlua autoreconf -ifv # This is why hardcoding paths is bad. @@ -470,6 +466,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Tue Nov 10 2016 Tom Callaway - 1.16.0-1 +- update to 1.16.0 + * Mon Sep 14 2015 Tom Callaway - 1.15.1-2 - fix compilation against current lua (thanks to Rafael Fonseca) diff --git a/sources b/sources index 94beeaf..8445106 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7e57880566f67e3375fcd33d8143dde efl-1.15.1.tar.xz +3290df30810e7c5aa66df3923fa42f14 efl-1.16.0.tar.xz