[arch-commits] Commit in fontforge/trunk (PKGBUILD giflib.patch)

[Gaetan Bisson]

    Date: Tuesday, May 27, 2014 @ 19:28:50
  Author: bisson
Revision: 213655

rebuild for giflib-5.1.0

Added:
  fontforge/trunk/giflib.patch
Modified:
  fontforge/trunk/PKGBUILD

--------------+
 PKGBUILD     |   11 +++++++----
 giflib.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-05-27 13:33:40 UTC (rev 213654)
+++ PKGBUILD    2014-05-27 17:28:50 UTC (rev 213655)
@@ -6,9 +6,9 @@
 pkgname=fontforge
 _pkgver=2.0.20140101
 pkgver=${_pkgver##*.}
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
-url='http://fontforge.sourceforge.net/'
+url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libltdl' 'libxkbui' 'libxi'
@@ -15,9 +15,11 @@
          'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 
'libunicodenames' 'zeromq'
          'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 
'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz";
-        'http://fontforge.org/cidmaps.tgz')
+        'http://fontforge.org/cidmaps.tgz'
+        'giflib.patch')
 sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
-          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+          '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
 
 options=('!makeflags')
 install=install
@@ -25,6 +27,7 @@
 prepare() {
        cd "${srcdir}/${pkgname}-${_pkgver}"
        sed '/fontforge_package_name/s/^#//' -i configure.ac
+       patch -p1 -i ../giflib.patch
        ./autogen.sh
 }
 

Added: giflib.patch
===================================================================
--- giflib.patch                                (rev 0)
+++ giflib.patch        2014-05-27 17:28:50 UTC (rev 213655)
@@ -0,0 +1,37 @@
+diff -Naur old/gutils/gimagereadgif.c new/gutils/gimagereadgif.c
+--- old/gutils/gimagereadgif.c 2014-01-01 05:56:11.000000000 -1000
++++ new/gutils/gimagereadgif.c 2014-05-27 07:04:34.930338020 -1000
+@@ -170,13 +170,13 @@
+ 
+     if ( DGifSlurp(gif)!=GIF_OK ) {
+       fprintf(stderr,"Bad input file \"%s\"\n",filename );
+-      DGifCloseFile(gif);
++      DGifCloseFile(gif, NULL);
+       return( NULL );
+     }
+ 
+     /* Process each image so that it/they can be imported into FF. */
+     if ( (images=(GImage **) malloc(gif->ImageCount*sizeof(GImage *)))==NULL 
) {
+-      DGifCloseFile(gif);
++      DGifCloseFile(gif, NULL);
+       NoMoreMemMessage();
+       return( NULL );
+     }
+@@ -185,7 +185,7 @@
+       if ( (images[i]=ProcessSavedImage(gif,&gif->SavedImages[i],il))==NULL ) 
{
+           while ( --i>=0 ) free(images[i]);
+           free(images);
+-          DGifCloseFile(gif);
++          DGifCloseFile(gif, NULL);
+           return( NULL );
+       }
+     }
+@@ -195,7 +195,7 @@
+       ret = images[0];
+     else
+       ret = GImageCreateAnimation(images,gif->ImageCount);
+-    DGifCloseFile(gif);
++    DGifCloseFile(gif, NULL);
+     free(images);
+     return( ret );
+ }