Tue Jun 17 03:23:47 UTC 2014

2 files changed, 53 insertions, 10 deletions

diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
index 40e57269b..2a094f136 100644
--- a/extra/efl/PKGBUILD
+++ b/extra/efl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213609 2014-05-26 19:22:35Z ronald $
+# $Id: PKGBUILD 215156 2014-06-14 19:17:03Z andyrtr $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
 
 pkgbase=efl
 pkgname=('efl' 'efl-docs')
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -14,18 +14,22 @@ depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
          'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
          'libxinerama' 'libxrandr' 'libxss' 'python2'
          'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
-	 'libxkbcommon' 'wayland')
+         'libxkbcommon' 'wayland')
 makedepends=('doxygen')
-replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 
-	'emotion' 'ethumb' 'evas')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
+          'emotion' 'ethumb' 'evas')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz
+        efl-1.10.0-giflib-5.1.0.patch)
 install=efl.install
-sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa')
+sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa'
+          '269bc6104859291107aa0c9eac2d9d3026df5b12')
 
 
 prepare() {
-  sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
+  patch -p1 -i "${srcdir}/efl-1.10.0-giflib-5.1.0.patch"
 }
 
 build() {
@@ -48,9 +52,9 @@ package_efl(){
 
   # install non-standard license files
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
-	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
-	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
 }
 
 package_efl-docs() {
diff --git a/extra/efl/efl-1.10.0-giflib-5.1.0.patch b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
new file mode 100644
index 000000000..429b91ea8
--- /dev/null
+++ b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+    ret = EINA_TRUE;
+ 
+ on_error: // jump here on any errors to clean up
+-   if (gif) DGifCloseFile(gif);
++   if (gif) DGifCloseFile(gif, NULL);
+    if (fi.map) eina_file_map_free(f, fi.map);
+    return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+    // start as we have nothnig to build on
+    if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+    loader->imgnum = imgnum;
+    if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+    Loader_Info *loader = loader_data;
+-   if (loader->gif) DGifCloseFile(loader->gif);
++   if (loader->gif) DGifCloseFile(loader->gif, NULL);
+    if ((loader->fi.map) && (loader->f))
+      eina_file_map_free(loader->f, loader->fi.map);
+    free(loader);