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

[Gaetan Bisson]

    Date: Thursday, December 25, 2014 @ 10:03:18
  Author: bisson
Revision: 228034

fix FS#43161

Modified:
  fontforge/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-25 07:12:20 UTC (rev 228033)
+++ PKGBUILD	2014-12-25 09:03:18 UTC (rev 228034)
@@ -4,29 +4,39 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=fontforge
-pkgver=20141126
-pkgrel=1
+_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=('libltdl' 'libxkbui' 'libxi'
+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}.tar.gz"
+source=("http://github.com/fontforge/fontforge/releases/download/${pkgver}/fontforge-${_pkgver}-Unix-Source.tar.gz"
         'http://fontforge.org/cidmaps.tgz')
 sha1sums=('ecd776480a47cdcbe1b30ce275172d7d52288e77'
           'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
-options=('!makeflags')
 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
+	./bootstrap --force
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \