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

[Jan de Groot]

    Date: Wednesday, June 11, 2014 @ 14:00:08
  Author: jgc
Revision: 214997

upgpkg: emacs 24.3-7

giflib 5.1 rebuild

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

--------------------------+
 PKGBUILD                 |    4 +-
 emacs-24.3-giflib5.patch |   71 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-11 11:40:28 UTC (rev 214996)
+++ PKGBUILD	2014-06-11 12:00:08 UTC (rev 214997)
@@ -4,7 +4,7 @@
 
 pkgname=emacs
 pkgver=24.3
-pkgrel=6
+pkgrel=7
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -15,7 +15,7 @@
         emacs-24.3-giflib5.patch)
 md5sums=('ea9ed000ca165280265aabb55b9afbd7'
          'SKIP'
-         '560cdf463299e059c5fadf474bcba218')
+         'ccbe4e77440ff6ea56c8532ebc960446')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: emacs-24.3-giflib5.patch
===================================================================
--- emacs-24.3-giflib5.patch	2014-06-11 11:40:28 UTC (rev 214996)
+++ emacs-24.3-giflib5.patch	2014-06-11 12:00:08 UTC (rev 214997)
@@ -24,3 +24,74 @@
        if (!gif)
  	{
  	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
+@@ -7225,7 +7225,11 @@
+   if (!check_image_size (f, gif->SWidth, gif->SHeight))
+     {
+       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7234,7 +7238,11 @@
+   if (rc == GIF_ERROR || gif->ImageCount <= 0)
+     {
+       image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7246,7 +7254,11 @@
+       {
+ 	image_error ("Invalid image number `%s' in image `%s'",
+ 		     image_number, img->spec);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++	fn_DGifCloseFile (gif, NULL);
++#else
+ 	fn_DGifCloseFile (gif);
++#endif
+ 	return 0;
+       }
+   }
+@@ -7264,14 +7276,22 @@
+   if (!check_image_size (f, width, height))
+     {
+       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+   /* Create the X image and pixmap.  */
+   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+     {
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7447,7 +7467,11 @@
+ 			    Fcons (make_number (gif->ImageCount),
+ 				   img->lisp_data));
+ 
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++  fn_DGifCloseFile (gif, NULL);
++#else
+   fn_DGifCloseFile (gif);
++#endif
+ 
+   /* Maybe fill in the background field while we have ximg handy. */
+   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))