1.21.0
This commit is contained in:
Tom Callaway
parent
91b87eb8e4
commit
ec7026fa40
|
|
@ -21,3 +21,4 @@
|
|||
/efl-1.20.4.tar.xz
|
||||
/efl-1.20.5.tar.xz
|
||||
/efl-1.20.7.tar.xz
|
||||
/efl-1.21.0.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
diff -up efl-1.21.0/src/lib/edje/edje_private.h.luajitfix efl-1.21.0/src/lib/edje/edje_private.h
|
||||
--- efl-1.21.0/src/lib/edje/edje_private.h.luajitfix 2018-08-18 14:53:50.946311297 -0400
|
||||
+++ efl-1.21.0/src/lib/edje/edje_private.h 2018-08-18 14:55:48.918580278 -0400
|
||||
@@ -33,6 +33,9 @@
|
||||
#include <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#ifndef luaL_reg
|
||||
+# define luaL_reg luaL_Reg
|
||||
+#endif
|
||||
#include <setjmp.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
diff -up efl-1.21.0/src/lib/elua/elua_private.h.luajitfix efl-1.21.0/src/lib/elua/elua_private.h
|
||||
--- efl-1.21.0/src/lib/elua/elua_private.h.luajitfix 2018-07-27 06:22:36.000000000 -0400
|
||||
+++ efl-1.21.0/src/lib/elua/elua_private.h 2018-08-18 14:53:50.946311297 -0400
|
||||
@@ -27,6 +27,9 @@
|
||||
#include <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#ifndef luaL_reg
|
||||
+# define luaL_reg luaL_Reg
|
||||
+#endif
|
||||
|
||||
#include "Elua.h"
|
||||
|
||||
diff -up efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c
|
||||
--- efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2018-05-17 16:34:58.000000000 -0400
|
||||
+++ efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c 2018-08-18 14:53:50.946311297 -0400
|
||||
@@ -13,6 +13,9 @@
|
||||
#include <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#ifndef luaL_reg
|
||||
+# define luaL_reg luaL_Reg
|
||||
+#endif
|
||||
|
||||
#define FILTERS_LEGACY_COMPAT
|
||||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff -up efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c
|
||||
--- efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma 2018-08-18 15:27:24.073708072 -0400
|
||||
+++ efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c 2018-08-18 15:28:38.690980709 -0400
|
||||
@@ -130,7 +130,10 @@ _default_format_cb(void *data, Eina_Strb
|
||||
}
|
||||
else if (sd->format_type == FORMAT_TYPE_STATIC)
|
||||
{
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wformat-security"
|
||||
eina_strbuf_append_printf(str, sd->template);
|
||||
+#pragma GCC diagnostic pop
|
||||
}
|
||||
else
|
||||
{
|
||||
21
efl.spec
21
efl.spec
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
|
||||
Name: efl
|
||||
Version: 1.20.7
|
||||
Release: 4%{?dist}
|
||||
Version: 1.21.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Collection of Enlightenment libraries
|
||||
License: BSD and LGPLv2+ and GPLv2 and zlib
|
||||
URL: http://enlightenment.org/
|
||||
|
|
@ -38,7 +38,10 @@ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
|
|||
# but this works for now.
|
||||
Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
|
||||
# If luaL_reg is not defined, define it.
|
||||
Patch2: efl-1.19.0-luajitfix.patch
|
||||
Patch2: efl-1.21.0-luajitfix.patch
|
||||
# This printf is safe even if format-security disagrees
|
||||
Patch3: efl-1.21.0-use-pragma-to-ignore-safe-printf.patch
|
||||
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: libunwind-devel
|
||||
%endif
|
||||
|
|
@ -53,7 +56,7 @@ BuildRequires: libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-dev
|
|||
BuildRequires: libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel
|
||||
BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel
|
||||
BuildRequires: libwebp-devel tslib-devel SDL2-devel SDL-devel c-ares-devel
|
||||
BuildRequires: libxkbcommon-devel uuid-devel
|
||||
BuildRequires: libxkbcommon-devel uuid-devel libxkbcommon-x11-devel
|
||||
BuildRequires: pkgconfig(poppler-cpp) >= 0.12
|
||||
BuildRequires: pkgconfig(libspectre) pkgconfig(libraw)
|
||||
BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0
|
||||
|
|
@ -195,6 +198,7 @@ Development files for EFL.
|
|||
%patch1 -p1 -b .old
|
||||
%endif
|
||||
%patch2 -p1 -b .luajitfix
|
||||
%patch3 -p1 -b .pragma
|
||||
autoreconf -ifv
|
||||
|
||||
# This is why hardcoding paths is bad.
|
||||
|
|
@ -278,6 +282,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/ecore_con/
|
||||
%{_libdir}/ecore_evas/
|
||||
%{_libdir}/ecore_imf/
|
||||
%{_libdir}/ecore_wl2/
|
||||
%{_libdir}/libecore*.so.*
|
||||
%{_datadir}/ecore/
|
||||
%{_datadir}/ecore_imf/
|
||||
|
|
@ -331,7 +336,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/elementary/
|
||||
%{_datadir}/applications/elementary*.desktop
|
||||
%{_datadir}/elementary/
|
||||
%{_datadir}/icons/elementary.png
|
||||
%{_datadir}/icons/hicolor/*/apps/elementary.png
|
||||
# elocation
|
||||
%{_libdir}/libelocation.so.1*
|
||||
# elput
|
||||
|
|
@ -388,7 +393,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/cmake/Efl/
|
||||
%{_libdir}/libefl.so
|
||||
%{_libdir}/libefl_wl.so
|
||||
%{_libdir}/pkgconfig/efl-core.pc
|
||||
%{_libdir}/pkgconfig/efl-cxx.pc
|
||||
%{_libdir}/pkgconfig/efl-net.pc
|
||||
%{_libdir}/pkgconfig/efl-ui.pc
|
||||
%{_libdir}/pkgconfig/efl-wl.pc
|
||||
%{_libdir}/pkgconfig/efl.pc
|
||||
# ecore-devel
|
||||
|
|
@ -545,6 +553,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/pkgconfig/evas*.pc
|
||||
|
||||
%changelog
|
||||
* Sat Aug 18 2018 Tom Callaway <spot@fedoraproject.org> - 1.21.0-1
|
||||
- Update to 1.21.0
|
||||
|
||||
* Thu Jul 19 2018 Adam Williamson <awilliam@redhat.com> - 1.20.7-4
|
||||
- Rebuild for new libraw
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (efl-1.20.7.tar.xz) = c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
|
||||
SHA512 (efl-1.21.0.tar.xz) = 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
|
||||
|
|
|
|||
Loading…
Reference in New Issue