From b82fd4f74fc0348ebff623acf1d7e0ca49864ac0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 30 Aug 2016 14:36:03 -0400 Subject: [PATCH] 1.18.0 --- .gitignore | 1 + efl-1.11.4-tslibfix.patch | 10 ++++----- efl.spec | 43 +++++++++++++++++++++++++++++++++------ sources | 2 +- 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 5668a92..79f9c47 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /efl-1.17.0.tar.xz /efl-1.17.1.tar.xz /efl-1.17.2.tar.xz +/efl-1.18.0.tar.xz diff --git a/efl-1.11.4-tslibfix.patch b/efl-1.11.4-tslibfix.patch index 87aa16d..94e8526 100644 --- a/efl-1.11.4-tslibfix.patch +++ b/efl-1.11.4-tslibfix.patch @@ -1,8 +1,8 @@ -diff -up efl-1.11.4/configure.ac.tslibfix efl-1.11.4/configure.ac ---- efl-1.11.4/configure.ac.tslibfix 2014-10-26 21:42:40.831031217 -0400 -+++ efl-1.11.4/configure.ac 2014-10-26 21:42:55.458006364 -0400 -@@ -2661,7 +2661,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eco - EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]) +diff -up efl-1.18.0/configure.ac.tslibfix efl-1.18.0/configure.ac +--- efl-1.18.0/configure.ac.tslibfix 2016-08-29 15:35:41.784900935 -0400 ++++ efl-1.18.0/configure.ac 2016-08-29 15:35:48.936847061 -0400 +@@ -3442,7 +3442,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo] + EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) -EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) diff --git a/efl.spec b/efl.spec index 9c32f20..feb78fa 100644 --- a/efl.spec +++ b/efl.spec @@ -24,8 +24,8 @@ Name: efl -Version: 1.17.2 -Release: 2%{?dist} +Version: 1.18.0 +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -52,7 +52,7 @@ BuildRequires: scim-devel BuildRequires: ibus-devel BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel %if %{use_wayland} -BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel +BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel >= 1.11.0 BuildRequires: libwayland-cursor-devel libwayland-server-devel %endif BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel @@ -86,6 +86,9 @@ Provides: eio = %{version}-%{release} Provides: eio%{?_isa} = %{version}-%{release} Obsoletes: eio <= 1.7.10 Provides: eldbus%{?_isa} = %{version}-%{release} +Provides: elementary = %{version}-%{release} +Provides: elementary%{?_isa} = %{version}-%{release} +Obsoletes: elementary <= 1.17.1 Provides: elocation%{?_isa} = %{version}-%{release} Provides: elua%{?_isa} = %{version}-%{release} Provides: embryo = %{version}-%{release} @@ -200,6 +203,7 @@ sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \ %if %{use_wayland} --enable-wayland \ %endif + --enable-elput \ --enable-drm \ --enable-drm-hw-accel \ --with-opengl=full \ @@ -251,6 +255,7 @@ fi %{_libdir}/libefl.so.1* %{_bindir}/efl_debug %{_bindir}/efl_debugd +%{_datadir}/icons/Enlightenment-X/ # ecore %{_bindir}/ecore_evas_convert %{_libdir}/ecore/ @@ -297,8 +302,22 @@ fi # eldbus %{_bindir}/eldbus-codegen %{_libdir}/libeldbus.so.1* +# elementary +%{_bindir}/elementary_codegen +%{_bindir}/elementary_config +%{_bindir}/elementary_quicklaunch +%{_bindir}/elementary_run +%{_bindir}/elementary_test +%{_bindir}/elm_prefs_cc +%{_libdir}/libelementary.so.1* +%{_libdir}/elementary/ +%{_datadir}/applications/elementary*.desktop +%{_datadir}/elementary/ +%{_datadir}/icons/elementary.png # elocation %{_libdir}/libelocation.so.1* +# elput +%{_libdir}/libelput.so.1* # elua %if 0%{?has_luajit} %{_bindir}/elua @@ -351,11 +370,10 @@ fi # ecore-devel %{_includedir}/ecore-1/ %{_includedir}/ecore-audio-1/ -%{_includedir}/ecore-audio-cxx-1/ %{_includedir}/ecore-avahi-1/ %{_includedir}/ecore-con-1/ %{_includedir}/ecore-cxx-1/ -%{_includedir}/ecore-drm-1/ +%{_includedir}/ecore-drm2-1/ %{_includedir}/ecore-evas-1/ %{_includedir}/ecore-fb-1/ %{_includedir}/ecore-file-1/ @@ -366,7 +384,6 @@ fi %{_includedir}/ecore-ipc-1/ %{_includedir}/ecore-sdl-1/ %if %{use_wayland} -%{_includedir}/ecore-wayland-1/ %{_includedir}/ecore-wl2-1/ %endif %{_includedir}/ecore-x-1/ @@ -424,10 +441,21 @@ fi %{_libdir}/cmake/Eldbus/ %{_libdir}/libeldbus.so %{_libdir}/pkgconfig/eldbus.pc +# elementary-devel +%{_includedir}/elementary-1/ +%{_includedir}/elementary-cxx-1/ +%{_libdir}/cmake/Elementary/ +%{_libdir}/libelementary.so +%{_libdir}/pkgconfig/elementary.pc +%{_libdir}/pkgconfig/elementary-cxx.pc # elocation-devel %{_includedir}/elocation-1/ %{_libdir}/libelocation.so %{_libdir}/pkgconfig/elocation.pc +# elput-devel +%{_includedir}/elput-1/ +%{_libdir}/libelput.so +%{_libdir}/pkgconfig/elput.pc # elua-devel %if 0%{?has_luajit} %{_includedir}/elua-1/ @@ -492,6 +520,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon Aug 29 2016 Tom Callaway - 1.18.0-1 +- update to 1.18.0 + * Mon Aug 29 2016 Igor Gnatenko - 1.17.2-2 - Rebuild for LuaJIT 2.1.0 diff --git a/sources b/sources index e651f07..7a3a754 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ff0033401fec519aef1f950f1ea3464 efl-1.17.2.tar.xz +e528319fffed660902a820a7a6f944b4 efl-1.18.0.tar.xz