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

[Jan Steffens]

    Date: Monday, June 22, 2020 @ 21:38:05
  Author: heftig
Revision: 390137

2.6.8-1

Modified:
  harfbuzz/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-22 20:36:42 UTC (rev 390136)
+++ PKGBUILD	2020-06-22 21:38:05 UTC (rev 390137)
@@ -1,8 +1,9 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgbase=harfbuzz
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=2.6.7
+pkgver=2.6.8
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -9,9 +10,9 @@
 arch=(x86_64)
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc
-             ragel git python)
+             ragel git python meson)
 checkdepends=(python-fonttools python-setuptools)
-_commit=fb46a32ed0322d3f617dbfc7b982ff26f47d789c  # tags/2.6.7^0
+_commit=e4203c14699cc0903a2b4611167a7b99532cfdb0  # tags/2.6.8^0
 source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -22,27 +23,16 @@
 
 prepare() {
   cd harfbuzz
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd harfbuzz
-  ./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
+  arch-meson harfbuzz build \
+    -D graphite=enabled
+  meson compile -C build
 }
 
 check() {
-  cd harfbuzz
-  TMPDIR="$srcdir" make check
+  TMPDIR="$srcdir" meson test -C build --print-errorlogs
   rm -rf "$srcdir"/tmp*
 }
 
@@ -52,15 +42,15 @@
   provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
   optdepends=('cairo: hb-view program')
 
-  cd harfbuzz
-  make DESTDIR="$pkgdir" install
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+  DESTDIR="$pkgdir" meson install -C build
 
-# Split harfbuzz-icu
-  mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu
-  mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib
-  mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig
-  mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
+  # Split harfbuzz-icu
+  mkdir -p hb-icu/usr/{include/harfbuzz,lib/pkgconfig}
+  mv -t hb-icu/usr/lib "$pkgdir"/usr/lib/libharfbuzz-icu*
+  mv -t hb-icu/usr/lib/pkgconfig "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc
+  mv -t hb-icu/usr/include/harfbuzz "$pkgdir"/usr/include/harfbuzz/hb-icu.h
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
 }
 
 package_harfbuzz-icu() {