diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-17 03:27:11 +0000 |
| commit | 6459b84bf754eda5323f40eb7af76dde65b63251 (patch) | |
| tree | 81947a270848520d4cf2f9d1c5ce91ced54fcdff /extra/fontforge | |
| parent | 942111e62628e9a5c4729563215b1cfb8911735e (diff) | |
Tue Jun 17 03:23:47 UTC 2014
Diffstat (limited to 'extra/fontforge')
| -rw-r--r-- | extra/fontforge/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/fontforge/giflib.patch | 37 |
2 files changed, 45 insertions, 5 deletions
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index e06f51c1d..e5532bc08 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 209262 2014-03-31 07:34:34Z bisson $ +# $Id: PKGBUILD 215159 2014-06-14 19:17:07Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,18 +6,20 @@ 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' '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 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${_pkgver}" sed '/fontforge_package_name/s/^#//' -i configure.ac + patch -p1 -i ../giflib.patch ./autogen.sh } diff --git a/extra/fontforge/giflib.patch b/extra/fontforge/giflib.patch new file mode 100644 index 000000000..6234484a6 --- /dev/null +++ b/extra/fontforge/giflib.patch @@ -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 ); + } |