From 731b62af4750d93321f74d66ba291ca1dd6301e8 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Thu, 1 Aug 2013 13:33:45 +0200
Subject: update emacs with patch for giflib5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 emacs-gtk2/PKGBUILD                 | 14 +++++++++-----
 emacs-gtk2/emacs-24.3-giflib5.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 emacs-gtk2/emacs-24.3-giflib5.patch

diff --git a/emacs-gtk2/PKGBUILD b/emacs-gtk2/PKGBUILD
index 0a9a185..4182d3b 100644
--- a/emacs-gtk2/PKGBUILD
+++ b/emacs-gtk2/PKGBUILD
@@ -5,23 +5,27 @@
 _pkgname=emacs
 pkgname=$_pkgname-gtk2
 pkgver=24.3
-pkgrel=4
+pkgrel=6
 pkgdesc="The extensible, customizable, self-documenting real-time display editor. GTK2 version"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick>=6.8.4.7')
 install=emacs-gtk2.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d' '6c258b159c921006eee4b1a1aeb1be75a79ad8ed92b36b1b08b262d41a091093')
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig} emacs-24.3-giflib5.patch)
+sha256sums=('70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d'
+            '6c258b159c921006eee4b1a1aeb1be75a79ad8ed92b36b1b08b262d41a091093'
+            '3a13fa178711b652366d13b4b9996d7db4355261615f38d1e8ab2c8d7725d1a9')
 provides=('emacs')
 conflicts=('emacs')
 
 
 build() {
   cd "$srcdir"/emacs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk2 --with-xft
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure \
+      --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+      --localstatedir=/var --with-x-toolkit=gtk2 --with-xft
   make
 }
 
diff --git a/emacs-gtk2/emacs-24.3-giflib5.patch b/emacs-gtk2/emacs-24.3-giflib5.patch
new file mode 100644
index 0000000..b8571ab
--- /dev/null
+++ b/emacs-gtk2/emacs-24.3-giflib5.patch
@@ -0,0 +1,26 @@
+--- src/image.c
++++ src/image.c	2013-05-21 15:49:41.945819346 +0000
+@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
+ 	}
+ 
+       /* Open the GIF file.  */
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpenFileName (SSDATA (file));
++#else
++      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
++#endif
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
+       memsrc.len = SBYTES (specified_data);
+       memsrc.index = 0;
+ 
++#if GIFLIB_MAJOR < 5
+       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++#else
++      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
++#endif
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
-- 
cgit v1.2.3-70-g09d2