Date: Monday, October 20, 2014 @ 01:19:49
Author: bisson
Revision: 224848
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
fontforge/repos/extra-i686/PKGBUILD
(from rev 224847, fontforge/trunk/PKGBUILD)
fontforge/repos/extra-i686/giflib.patch
(from rev 224847, fontforge/trunk/giflib.patch)
fontforge/repos/extra-i686/install
(from rev 224847, fontforge/trunk/install)
fontforge/repos/extra-x86_64/PKGBUILD
(from rev 224847, fontforge/trunk/PKGBUILD)
fontforge/repos/extra-x86_64/giflib.patch
(from rev 224847, fontforge/trunk/giflib.patch)
fontforge/repos/extra-x86_64/install
(from rev 224847, fontforge/trunk/install)
Deleted:
fontforge/repos/extra-i686/PKGBUILD
fontforge/repos/extra-i686/giflib.patch
fontforge/repos/extra-i686/install
fontforge/repos/extra-x86_64/PKGBUILD
fontforge/repos/extra-x86_64/giflib.patch
fontforge/repos/extra-x86_64/install
---------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++++++++++++++++++
/giflib.patch | 74 +++++++++++++++++++++++++++++++
/install | 24 ++++++++++
extra-i686/PKGBUILD | 59 -------------------------
extra-i686/giflib.patch | 37 ---------------
extra-i686/install | 12 -----
extra-x86_64/PKGBUILD | 59 -------------------------
extra-x86_64/giflib.patch | 37 ---------------
extra-x86_64/install | 12 -----
9 files changed, 200 insertions(+), 216 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-i686/PKGBUILD 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Eric Belanger <[email protected]>
-# Contributor: William Rea <[email protected]>
-
-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/extra-i686/PKGBUILD (from rev 224847,
fontforge/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-19 23:19:49 UTC (rev 224848)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Eric Belanger <[email protected]>
+# Contributor: William Rea <[email protected]>
+
+pkgname=fontforge
+pkgver=20141014
+pkgrel=1
+pkgdesc='Outline and bitmap font editor'
+url='http://www.fontforge.org/'
+arch=('i686' 'x86_64')
+license=('BSD')
+makedepends=('git')
+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/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
+ 'http://fontforge.org/cidmaps.tgz')
+sha1sums=('b366293e423a94d213824368460fa80f9a1ad810'
+ 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+
+options=('!makeflags')
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBZMQ_LIBS=-lzmq
+ export PYTHON=python2
+ ./bootstrap
+ ./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"
+}
Deleted: extra-i686/giflib.patch
===================================================================
--- extra-i686/giflib.patch 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-i686/giflib.patch 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,37 +0,0 @@
-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/extra-i686/giflib.patch (from rev 224847,
fontforge/trunk/giflib.patch)
===================================================================
--- extra-i686/giflib.patch (rev 0)
+++ extra-i686/giflib.patch 2014-10-19 23:19:49 UTC (rev 224848)
@@ -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 );
+ }
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-i686/install 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,12 +0,0 @@
-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/extra-i686/install (from rev 224847,
fontforge/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2014-10-19 23:19:49 UTC (rev 224848)
@@ -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
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-x86_64/PKGBUILD 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Eric Belanger <[email protected]>
-# Contributor: William Rea <[email protected]>
-
-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/extra-x86_64/PKGBUILD (from rev 224847,
fontforge/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-19 23:19:49 UTC (rev 224848)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Eric Belanger <[email protected]>
+# Contributor: William Rea <[email protected]>
+
+pkgname=fontforge
+pkgver=20141014
+pkgrel=1
+pkgdesc='Outline and bitmap font editor'
+url='http://www.fontforge.org/'
+arch=('i686' 'x86_64')
+license=('BSD')
+makedepends=('git')
+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/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz";
+ 'http://fontforge.org/cidmaps.tgz')
+sha1sums=('b366293e423a94d213824368460fa80f9a1ad810'
+ 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+
+options=('!makeflags')
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBZMQ_LIBS=-lzmq
+ export PYTHON=python2
+ ./bootstrap
+ ./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"
+}
Deleted: extra-x86_64/giflib.patch
===================================================================
--- extra-x86_64/giflib.patch 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-x86_64/giflib.patch 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,37 +0,0 @@
-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/extra-x86_64/giflib.patch (from rev 224847,
fontforge/trunk/giflib.patch)
===================================================================
--- extra-x86_64/giflib.patch (rev 0)
+++ extra-x86_64/giflib.patch 2014-10-19 23:19:49 UTC (rev 224848)
@@ -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 );
+ }
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2014-10-19 23:19:07 UTC (rev 224847)
+++ extra-x86_64/install 2014-10-19 23:19:49 UTC (rev 224848)
@@ -1,12 +0,0 @@
-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/extra-x86_64/install (from rev 224847,
fontforge/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2014-10-19 23:19:49 UTC (rev 224848)
@@ -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
+}
