[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)

[Jan de Groot]

    Date: Tuesday, July 30, 2013 @ 12:29:42
  Author: jgc
Revision: 191764

giflib rebuild
upgpkg: emacs 24.3-3

Added:
  emacs/trunk/emacs-24.3-giflib5.patch
Modified:
  emacs/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   15 +++++++++++----
 emacs-24.3-giflib5.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-30 10:02:50 UTC (rev 191763)
+++ PKGBUILD	2013-07-30 10:29:42 UTC (rev 191764)
@@ -4,20 +4,27 @@
 
 pkgname=emacs
 pkgver=24.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
+        emacs-24.3-giflib5.patch)
 md5sums=('ea9ed000ca165280265aabb55b9afbd7'
-         '3f6990fabfbe1d5f3cd58bace4eb20f1')
+         'SKIP'
+         '560cdf463299e059c5fadf474bcba218')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
   make
 }

Added: emacs-24.3-giflib5.patch
===================================================================
--- emacs-24.3-giflib5.patch	                        (rev 0)
+++ emacs-24.3-giflib5.patch	2013-07-30 10:29:42 UTC (rev 191764)
@@ -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);