diff --git a/.gitignore b/.gitignore index 512bc9a..1e5e8ab 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /efl-1.20.7.tar.xz /efl-1.21.0.tar.xz /efl-1.21.1.tar.xz +/efl-1.22.2.tar.xz diff --git a/efl-1.22.2-use-pragma-to-ignore-safe-printf.patch b/efl-1.22.2-use-pragma-to-ignore-safe-printf.patch new file mode 100644 index 0000000..f3422d8 --- /dev/null +++ b/efl-1.22.2-use-pragma-to-ignore-safe-printf.patch @@ -0,0 +1,14 @@ +diff -up efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c +--- efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma 2019-05-02 15:05:56.681118361 -0400 ++++ efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c 2019-05-02 15:07:48.641683821 -0400 +@@ -124,7 +124,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(str, sd->template); ++#pragma GCC diagnostic pop + } + else + { diff --git a/efl.spec b/efl.spec index 3834e71..be147ad 100644 --- a/efl.spec +++ b/efl.spec @@ -28,8 +28,8 @@ Name: efl -Version: 1.21.1 -Release: 5%{?dist} +Version: 1.22.2 +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -40,9 +40,7 @@ Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch # If luaL_reg is not defined, define it. 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 -# Use khrplatform defines -Patch4: efl-1.21.1-khrplatform.patch +Patch3: efl-1.22.2-use-pragma-to-ignore-safe-printf.patch %ifnarch s390 s390x BuildRequires: libunwind-devel @@ -200,7 +198,6 @@ Development files for EFL. %endif %patch2 -p1 -b .luajitfix %patch3 -p1 -b .pragma -%patch4 -p1 -b .khrplatform autoreconf -ifv # This is why hardcoding paths is bad. @@ -234,6 +231,7 @@ sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \ --disable-static \ --disable-cocoa \ --with-profile=release \ + --enable-install-eo-files \ %if ! 0%{?has_luajit} --enable-lua-old \ %endif @@ -379,7 +377,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/ethumb %{_datadir}/ethumb_client # evas -%{_bindir}/evas_* +# %%{_bindir}/evas_* %{_libdir}/evas/ %{_libdir}/libevas.so.* %{_datadir}/evas/ @@ -453,7 +451,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/pkgconfig/efreet-mime.pc %{_libdir}/pkgconfig/efreet-trash.pc # eina-devel -%{_bindir}/eina-bench-cmp %{_includedir}/eina-1/ %{_includedir}/eina-cxx-1/ %{_libdir}/cmake/Eina*/ @@ -552,6 +549,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/pkgconfig/evas*.pc %changelog +* Thu May 2 2019 Tom Callaway - 1.22.2-1 +- update to 1.22.2 + * Thu Feb 28 2019 Pete Walter - 1.21.1-5 - Update wayland deps diff --git a/sources b/sources index d083cb9..9519b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (efl-1.21.1.tar.xz) = 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63 +SHA512 (efl-1.22.2.tar.xz) = 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734