Date: Wednesday, October 15, 2014 @ 03:16:52
Author: dreisner
Revision: 224352
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
fontforge/repos/staging-i686/
fontforge/repos/staging-i686/PKGBUILD
(from rev 224351, fontforge/trunk/PKGBUILD)
fontforge/repos/staging-i686/giflib.patch
(from rev 224351, fontforge/trunk/giflib.patch)
fontforge/repos/staging-i686/install
(from rev 224351, fontforge/trunk/install)
fontforge/repos/staging-x86_64/
fontforge/repos/staging-x86_64/PKGBUILD
(from rev 224351, fontforge/trunk/PKGBUILD)
fontforge/repos/staging-x86_64/giflib.patch
(from rev 224351, fontforge/trunk/giflib.patch)
fontforge/repos/staging-x86_64/install
(from rev 224351, fontforge/trunk/install)
-----------------------------+
staging-i686/PKGBUILD | 59 ++++++++++++++++++++++++++++++++++++++++++
staging-i686/giflib.patch | 37 ++++++++++++++++++++++++++
staging-i686/install | 12 ++++++++
staging-x86_64/PKGBUILD | 59 ++++++++++++++++++++++++++++++++++++++++++
staging-x86_64/giflib.patch | 37 ++++++++++++++++++++++++++
staging-x86_64/install | 12 ++++++++
6 files changed, 216 insertions(+)
Copied: fontforge/repos/staging-i686/PKGBUILD (from rev 224351,
fontforge/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-10-15 01:16:52 UTC (rev 224352)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Eric Belanger <e...@archlinux.org>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgname=fontforge
+_pkgver=2.0.20140101
+pkgver=${_pkgver##*.}
+pkgrel=4
+pkgdesc='Outline and bitmap font editor'
+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'
+ 'giflib.patch')
+sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
+ 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+ '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
+
+options=('!makeflags')
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ sed '/fontforge_package_name/s/^#//' -i configure.ac
+ patch -p1 -i ../giflib.patch
+ ./autogen.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ export LIBZMQ_LIBS=-lzmq
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --enable-python-extension \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -d "${pkgdir}/usr/share/fontforge"
+ install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
+
+ install -d "${pkgdir}/usr/share/icons"
+ cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor"
+ rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 desktop/fontforge.desktop
"${pkgdir}/usr/share/applications/fontforge.desktop"
+}
Copied: fontforge/repos/staging-i686/giflib.patch (from rev 224351,
fontforge/trunk/giflib.patch)
===================================================================
--- staging-i686/giflib.patch (rev 0)
+++ staging-i686/giflib.patch 2014-10-15 01:16:52 UTC (rev 224352)
@@ -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 );
+ }
Copied: fontforge/repos/staging-i686/install (from rev 224351,
fontforge/trunk/install)
===================================================================
--- staging-i686/install (rev 0)
+++ staging-i686/install 2014-10-15 01:16:52 UTC (rev 224352)
@@ -0,0 +1,12 @@
+post_upgrade() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
Copied: fontforge/repos/staging-x86_64/PKGBUILD (from rev 224351,
fontforge/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-10-15 01:16:52 UTC (rev 224352)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Eric Belanger <e...@archlinux.org>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgname=fontforge
+_pkgver=2.0.20140101
+pkgver=${_pkgver##*.}
+pkgrel=4
+pkgdesc='Outline and bitmap font editor'
+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'
+ 'giflib.patch')
+sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
+ 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+ '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
+
+options=('!makeflags')
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ sed '/fontforge_package_name/s/^#//' -i configure.ac
+ patch -p1 -i ../giflib.patch
+ ./autogen.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ export LIBZMQ_LIBS=-lzmq
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --enable-python-extension \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -d "${pkgdir}/usr/share/fontforge"
+ install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
+
+ install -d "${pkgdir}/usr/share/icons"
+ cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor"
+ rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 desktop/fontforge.desktop
"${pkgdir}/usr/share/applications/fontforge.desktop"
+}
Copied: fontforge/repos/staging-x86_64/giflib.patch (from rev 224351,
fontforge/trunk/giflib.patch)
===================================================================
--- staging-x86_64/giflib.patch (rev 0)
+++ staging-x86_64/giflib.patch 2014-10-15 01:16:52 UTC (rev 224352)
@@ -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 );
+ }
Copied: fontforge/repos/staging-x86_64/install (from rev 224351,
fontforge/trunk/install)
===================================================================
--- staging-x86_64/install (rev 0)
+++ staging-x86_64/install 2014-10-15 01:16:52 UTC (rev 224352)
@@ -0,0 +1,12 @@
+post_upgrade() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
