harfbuzz: update to 1.7.5

1 files changed, 30 insertions, 18 deletions

diff --git a/abs/extra/harfbuzz/PKGBUILD b/abs/extra/harfbuzz/PKGBUILD
index df8912c..1316840 100644
--- a/abs/extra/harfbuzz/PKGBUILD
+++ b/abs/extra/harfbuzz/PKGBUILD
@@ -3,41 +3,53 @@
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=1.1.3
+pkgver=1.7.5
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
-arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+arch=(x86_64)
 license=(MIT)
-makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7')
+makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc ragel git
+             python)
+_commit=f0b700db394ccdff30ff83961a3e2ea9ff4ea472  # tags/1.7.5^0
+source=("git+https://anongit.freedesktop.org/git/harfbuzz#commit=$_commit")
+sha256sums=('SKIP')
 
-prepare() {
-  mkdir path
-  ln -s /usr/bin/python2 path/python
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
 
-  cd $pkgbase-$pkgver
+prepare() {
+  cd $pkgbase
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgbase-$pkgver
-  ./configure --prefix=/usr \
-    --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 \
-    --with-gobject
+  cd $pkgbase
+  ./configure \
+    --prefix=/usr \
+    --with-cairo \
+    --with-freetype \
+    --with-glib \
+    --with-gobject \
+    --with-graphite2 \
+    --with-icu \
+    --enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd $pkgbase-$pkgver
-  PATH="$srcdir/path:$PATH" make -k check || :
+  cd $pkgbase
+  make check
 }
 
 package_harfbuzz() {
   depends=(glib2 freetype2 graphite)
   optdepends=('cairo: hb-view program')
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make DESTDIR="$pkgdir" install
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
 
@@ -48,11 +60,11 @@ package_harfbuzz() {
   mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
 }
 
-package_harfbuzz-icu(){
+package_harfbuzz-icu() {
   pkgdesc="$pkgdesc (ICU integration)"
   depends=(harfbuzz icu)
 
   mv hb-icu/* "$pkgdir"
 
-  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
+  install -Dm644 $pkgbase/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
 }