[arch-commits] Commit in fontforge/repos (8 files)

Gaetan Bisson bisson at archlinux.org
Thu Dec 25 09:03:52 UTC 2014


    Date: Thursday, December 25, 2014 @ 10:03:51
  Author: bisson
Revision: 228035

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  fontforge/repos/extra-i686/PKGBUILD
    (from rev 228034, fontforge/trunk/PKGBUILD)
  fontforge/repos/extra-i686/install
    (from rev 228034, fontforge/trunk/install)
  fontforge/repos/extra-x86_64/PKGBUILD
    (from rev 228034, fontforge/trunk/PKGBUILD)
  fontforge/repos/extra-x86_64/install
    (from rev 228034, fontforge/trunk/install)
Deleted:
  fontforge/repos/extra-i686/PKGBUILD
  fontforge/repos/extra-i686/install
  fontforge/repos/extra-x86_64/PKGBUILD
  fontforge/repos/extra-x86_64/install

-----------------------+
 /PKGBUILD             |  122 ++++++++++++++++++++++++++++++++++++++++++++++++
 /install              |   24 +++++++++
 extra-i686/PKGBUILD   |   51 --------------------
 extra-i686/install    |   12 ----
 extra-x86_64/PKGBUILD |   51 --------------------
 extra-x86_64/install  |   12 ----
 6 files changed, 146 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-12-25 09:03:18 UTC (rev 228034)
+++ extra-i686/PKGBUILD	2014-12-25 09:03:51 UTC (rev 228035)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=fontforge
-pkgver=20141126
-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=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz"
-        'http://fontforge.org/cidmaps.tgz')
-sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
-          '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"
-}

Copied: fontforge/repos/extra-i686/PKGBUILD (from rev 228034, fontforge/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-12-25 09:03:51 UTC (rev 228035)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=fontforge
+_pkgver=2014-11-26
+pkgver=${_pkgver//-/}
+pkgrel=2
+pkgdesc='Outline and bitmap font editor'
+url='http://www.fontforge.org/'
+arch=('i686' 'x86_64')
+license=('BSD')
+makedepends=('git')
+depends=('libtool' 'libxkbui' 'libxi'
+         'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 'libunicodenames' 'zeromq'
+         'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${_pkgver}-Unix-Source.tar.gz"
+        'http://fontforge.org/cidmaps.tgz')
+sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
+          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	rm -fr libltdl
+	for i in m4/*.m4; do
+		if [[ ! -L $i ]]; then continue; fi
+		j=$(readlink "$i")
+		ln -sf "${j/aclocal\//aclocal\/lt}" "$i"
+	done
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LIBZMQ_LIBS=-lzmq
+	export PYTHON=python2
+	./bootstrap --force
+	./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/install
===================================================================
--- extra-i686/install	2014-12-25 09:03:18 UTC (rev 228034)
+++ extra-i686/install	2014-12-25 09:03:51 UTC (rev 228035)
@@ -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 228034, fontforge/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-12-25 09:03:51 UTC (rev 228035)
@@ -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-12-25 09:03:18 UTC (rev 228034)
+++ extra-x86_64/PKGBUILD	2014-12-25 09:03:51 UTC (rev 228035)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=fontforge
-pkgver=20141126
-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=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${pkgver}.tar.gz"
-        'http://fontforge.org/cidmaps.tgz')
-sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
-          '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"
-}

Copied: fontforge/repos/extra-x86_64/PKGBUILD (from rev 228034, fontforge/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-12-25 09:03:51 UTC (rev 228035)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=fontforge
+_pkgver=2014-11-26
+pkgver=${_pkgver//-/}
+pkgrel=2
+pkgdesc='Outline and bitmap font editor'
+url='http://www.fontforge.org/'
+arch=('i686' 'x86_64')
+license=('BSD')
+makedepends=('git')
+depends=('libtool' 'libxkbui' 'libxi'
+         'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 'libunicodenames' 'zeromq'
+         'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${_pkgver}-Unix-Source.tar.gz"
+        'http://fontforge.org/cidmaps.tgz')
+sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
+          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	rm -fr libltdl
+	for i in m4/*.m4; do
+		if [[ ! -L $i ]]; then continue; fi
+		j=$(readlink "$i")
+		ln -sf "${j/aclocal\//aclocal\/lt}" "$i"
+	done
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LIBZMQ_LIBS=-lzmq
+	export PYTHON=python2
+	./bootstrap --force
+	./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/install
===================================================================
--- extra-x86_64/install	2014-12-25 09:03:18 UTC (rev 228034)
+++ extra-x86_64/install	2014-12-25 09:03:51 UTC (rev 228035)
@@ -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 228034, fontforge/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-12-25 09:03:51 UTC (rev 228035)
@@ -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
+}



More information about the arch-commits mailing list