From 35c562a85cca9ebc8763a64f0bb53b62b71b7319 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 15 Oct 2012 16:32:55 +0200
Subject: [PATCH] imlib2: rebuild against giflib-5.x.

---
 srcpkgs/imlib2/imlib2-devel.template    |  4 ++--
 srcpkgs/imlib2/imlib2.rshlibs           |  2 +-
 srcpkgs/imlib2/patches/giflib-5.0.patch | 24 ++++++++++++++++++++++++
 srcpkgs/imlib2/template                 | 12 ++++++++----
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/imlib2/patches/giflib-5.0.patch

diff --git a/srcpkgs/imlib2/imlib2-devel.template b/srcpkgs/imlib2/imlib2-devel.template
index 21c7529548..f58d15901b 100644
--- a/srcpkgs/imlib2/imlib2-devel.template
+++ b/srcpkgs/imlib2/imlib2-devel.template
@@ -1,6 +1,7 @@
 # Template file for 'imlib2-devel'.
 #
-depends="imlib2>=$version"
+noarch=yes
+depends="imlib2-${version}_${revision}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
@@ -11,5 +12,4 @@ do_install() {
 	vmove usr/include usr
 	vmove usr/share usr
 	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/imlib2/imlib2.rshlibs b/srcpkgs/imlib2/imlib2.rshlibs
index d79c319fed..a8b9316506 100644
--- a/srcpkgs/imlib2/imlib2.rshlibs
+++ b/srcpkgs/imlib2/imlib2.rshlibs
@@ -7,7 +7,7 @@ libdl.so.2
 libm.so.6
 libc.so.6
 libjpeg.so.8
-libgif.so.4
+libgif.so.6
 libid3tag.so.0
 libtiff.so.5
 libpng15.so.15
diff --git a/srcpkgs/imlib2/patches/giflib-5.0.patch b/srcpkgs/imlib2/patches/giflib-5.0.patch
new file mode 100644
index 0000000000..647775202f
--- /dev/null
+++ b/srcpkgs/imlib2/patches/giflib-5.0.patch
@@ -0,0 +1,24 @@
+Adapt DGifOpenFileHandle() to the 5.x API.
+
+--- src/modules/loaders/loader_gif.c.orig	2012-10-15 16:29:26.667044054 +0200
++++ src/modules/loaders/loader_gif.c	2012-10-15 16:29:43.329649211 +0200
+@@ -19,7 +19,7 @@ load(ImlibImage * im, ImlibProgressFunct
+    int                 intoffset[] = { 0, 4, 2, 1 };
+    int                 intjump[] = { 8, 8, 4, 2 };
+    int                 transp;
+-   int                 fd;
++   int                 fd, err = 0;
+ 
+    done = 0;
+    rows = NULL;
+@@ -36,8 +36,8 @@ load(ImlibImage * im, ImlibProgressFunct
+ #endif
+    if (fd < 0)
+       return 0;
+-   gif = DGifOpenFileHandle(fd);
+-   if (!gif)
++   gif = DGifOpenFileHandle(fd, &err);
++   if (err)
+      {
+         close(fd);
+         return 0;
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index e832c41f15..5811920293 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,14 +1,18 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
 version=1.4.5
-revision=1
-distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
+revision=2
 build_style=gnu-configure
-configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding"
-makedepends="pkg-config freetype-devel jpeg-devel libpng-devel>=1.5.10 tiff-devel libid3tag-devel giflib-devel libXext-devel"
+configure_args="--disable-static --sysconfdir=/etc/imlib2
+ --enable-visibility-hiding"
+makedepends="pkg-config freetype-devel jpeg-devel libpng-devel>=1.5.10
+ tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel"
 subpackages="imlib2-devel"
 short_desc="Image manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
+homepage="http://sourceforge.net/projects/enlightenment/"
+license="BSD"
 checksum=6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
 long_desc="
  Imlib 2 is the successor to Imlib. It is NOT a newer version - it is a