From 796606efbbc8a66318efb93c58c9e3be306d9f0c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 19 Jul 2014 18:19:33 +0200 Subject: [PATCH] - updated to 1.10.2 - removed obsolete gif patch --- efl-gif.patch | 50 -------------------------------------------------- efl.spec | 6 ++---- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 efl-gif.patch diff --git a/efl-gif.patch b/efl-gif.patch deleted file mode 100644 index 4310f3b..0000000 --- a/efl-gif.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- efl-1.10.1/src/modules/evas/loaders/gif/evas_image_load_gif.c.orig 2014-06-03 12:38:57.000000000 +0200 -+++ efl-1.10.1/src/modules/evas/loaders/gif/evas_image_load_gif.c 2014-06-14 16:57:31.264950243 +0200 -@@ -528,7 +528,11 @@ - ret = EINA_TRUE; - - on_error: // jump here on any errors to clean up -+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1)) -+ if (gif) DGifCloseFile(gif, NULL); -+#else - if (gif) DGifCloseFile(gif); -+#endif - if (fi.map) eina_file_map_free(f, fi.map); - return ret; - } -@@ -606,7 +610,11 @@ - // start as we have nothnig to build on - if ((index > 0) && (index < loader->imgnum) && (animated->animated)) - { -+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1)) -+ if (loader->gif) DGifCloseFile(loader->gif, NULL); -+#else - if (loader->gif) DGifCloseFile(loader->gif); -+#endif - if ((loader->fi.map) && (loader->f)) - eina_file_map_free(loader->f, loader->fi.map); - loader->gif = NULL; -@@ -764,7 +772,11 @@ - loader->imgnum = imgnum; - if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE)) - { -+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1)) -+ if (loader->gif) DGifCloseFile(loader->gif, NULL); -+#else - if (loader->gif) DGifCloseFile(loader->gif); -+#endif - if ((loader->fi.map) && (loader->f)) - eina_file_map_free(loader->f, loader->fi.map); - loader->gif = NULL; -@@ -848,7 +860,11 @@ - evas_image_load_file_close_gif2(void *loader_data) - { - Loader_Info *loader = loader_data; -+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1)) -+ if (loader->gif) DGifCloseFile(loader->gif, NULL); -+#else - if (loader->gif) DGifCloseFile(loader->gif); -+#endif - if ((loader->fi.map) && (loader->f)) - eina_file_map_free(loader->f, loader->fi.map); - free(loader); diff --git a/efl.spec b/efl.spec index 514e9a0..04675a0 100644 --- a/efl.spec +++ b/efl.spec @@ -27,16 +27,15 @@ Summary: EFL - The Enlightenment Foundation Libraries Summary(pl.UTF-8): EFL (Enlightenment Foundation Libraries) - biblioteki tworzące Enlightment Name: efl -Version: 1.10.1 +Version: 1.10.2 Release: 1 License: LGPL v2.1+, BSD (depends on component) Group: Libraries Source0: http://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.bz2 -# Source0-md5: eadc55e41602b3b34d6b9b0e0b12826a +# Source0-md5: a99ea8c50537c4362c7e380656af20d8 Patch0: %{name}-pc.patch Patch1: %{name}-wayland.patch Patch2: %{name}-am.patch -Patch3: %{name}-gif.patch URL: https://trac.enlightenment.org/e/wiki/EFL %{?with_egl:BuildRequires: EGL-devel} BuildRequires: OpenGL-GLX-devel @@ -2418,7 +2417,6 @@ Obsługa składni EDC dla Vima. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %{__libtoolize} -- 2.43.0