From 860d1521261f520ab1f71568d44b2af12c89742c Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 3 Feb 2016 14:44:15 +1000 Subject: [PATCH 1/5] - Upstream update to 1.17.0 - Removed: /usr/include/ector-1 --- .gitignore | 1 + efl-1.15.1-fixlua.patch | 12 ------------ efl.spec | 11 +++++++---- sources | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 efl-1.15.1-fixlua.patch diff --git a/.gitignore b/.gitignore index f9091b2..821c0d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /efl-1.15.0.tar.xz /efl-1.16.0.tar.xz /efl-1.16.1.tar.xz +/efl-1.17.0.tar.xz diff --git a/efl-1.15.1-fixlua.patch b/efl-1.15.1-fixlua.patch deleted file mode 100644 index b2fcf21..0000000 --- a/efl-1.15.1-fixlua.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ca2befa..8ec502e 100644 --- a/efl.spec +++ b/efl.spec @@ -12,8 +12,8 @@ %global use_wayland 0 Name: efl -Version: 1.16.1 -Release: 2%{?dist} +Version: 1.17.0 +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -171,7 +171,7 @@ sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \ --enable-scim \ %else --disable-scim \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \ + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \ %endif --enable-fb \ %if %{use_wayland} @@ -349,7 +349,6 @@ fi %{_libdir}/cmake/Ecore*/ %{_libdir}/libecore*.so %{_libdir}/pkgconfig/ecore*.pc -%{_includedir}/ector-1/ %{_libdir}/libector.so %{_libdir}/pkgconfig/ector.pc # edje-devel @@ -469,6 +468,10 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Wed Feb 3 2016 Ding-Yi Chen - 1.17.0-1 +- Upstream update to 1.17.0 +- Removed: /usr/include/ector-1 + * Tue Jan 19 2016 Ding-Yi Chen - 1.16.1-2 - Fix rpmlint error diff --git a/sources b/sources index bedaed9..3719980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a4a22c3ff094f3e7c60d03d3c0fa252 efl-1.16.1.tar.xz +c7cf8478edff3f1342e5f664b347c13c efl-1.17.0.tar.xz From aa4cac072cc4c9023c735101ac29680934369715 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Tue, 9 Feb 2016 07:58:18 -0500 Subject: [PATCH 2/5] Rebuild for bullet 2.83 --- efl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index 8ec502e..6f990ed 100644 --- a/efl.spec +++ b/efl.spec @@ -13,7 +13,7 @@ Name: efl Version: 1.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -468,6 +468,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Tue Feb 09 2016 Rich Mattes - 1.17.0-2 +- Rebuild for bullet 2.83 + * Wed Feb 3 2016 Ding-Yi Chen - 1.17.0-1 - Upstream update to 1.17.0 - Removed: /usr/include/ector-1 From 5c1c064b880613184b20b6430af060c68d98b594 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 14 Mar 2016 16:28:32 +1000 Subject: [PATCH 3/5] Reenable wayland support --- efl.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/efl.spec b/efl.spec index 6f990ed..8ec502e 100644 --- a/efl.spec +++ b/efl.spec @@ -13,7 +13,7 @@ Name: efl Version: 1.17.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -468,9 +468,6 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog -* Tue Feb 09 2016 Rich Mattes - 1.17.0-2 -- Rebuild for bullet 2.83 - * Wed Feb 3 2016 Ding-Yi Chen - 1.17.0-1 - Upstream update to 1.17.0 - Removed: /usr/include/ector-1 From 4aca4b7c2cd7b78cbec8de473190f2c21f0aefe5 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 14 Mar 2016 17:27:42 +1000 Subject: [PATCH 4/5] option: enable wayland --- efl.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index 8ec502e..a448547 100644 --- a/efl.spec +++ b/efl.spec @@ -9,11 +9,11 @@ # to get anything to work. (*cough*terminology*cough*) %global with_scim 0 -%global use_wayland 0 +%global use_wayland 1 Name: efl Version: 1.17.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -344,6 +344,7 @@ fi %{_includedir}/ecore-sdl-1/ %if %{use_wayland} %{_includedir}/ecore-wayland-1/ +%{_includedir}/ecore-wl2-1/ %endif %{_includedir}/ecore-x-1/ %{_libdir}/cmake/Ecore*/ @@ -468,6 +469,12 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon Mar 14 2016 Ding-Yi Chen - 1.17.0-3 +- Re-enable wayland + +* Tue Feb 09 2016 Rich Mattes - 1.17.0-2 +- Rebuild for bullet 2.83 + * Wed Feb 3 2016 Ding-Yi Chen - 1.17.0-1 - Upstream update to 1.17.0 - Removed: /usr/include/ector-1 From 5be218fd324786ba2ca4262c1e6f53618475cf3e Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 14 Mar 2016 17:46:47 +1000 Subject: [PATCH 5/5] option: add BuildRequires: libwayland-server-devel --- efl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/efl.spec b/efl.spec index a448547..349871a 100644 --- a/efl.spec +++ b/efl.spec @@ -37,6 +37,7 @@ BuildRequires: ibus-devel BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel %if %{use_wayland} BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel +BuildRequires: libwayland-server-devel %endif BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel BuildRequires: mesa-libgbm-devel libinput-devel