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

[Jan Steffens]

    Date: Monday, June 22, 2020 @ 21:37:34
  Author: heftig
Revision: 650877

2.6.8-1

Modified:
  lib32-harfbuzz/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-22 21:31:20 UTC (rev 650876)
+++ PKGBUILD	2020-06-22 21:37:34 UTC (rev 650877)
@@ -1,8 +1,9 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Florian Pritz <bluewind at xinu.at>
 
 pkgbase=lib32-harfbuzz
 pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
-pkgver=2.6.7
+pkgver=2.6.8
 pkgrel=1
 pkgdesc="OpenType text shaping engine (32-bit)"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -9,9 +10,9 @@
 arch=(x86_64)
 license=(MIT)
 makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
-             harfbuzz)
+             meson harfbuzz)
 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,7 +23,6 @@
 
 prepare() {
   cd harfbuzz
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -30,24 +30,15 @@
   export CXX="g++ -m32"
   export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cd harfbuzz
-  ./configure \
-    --prefix=/usr \
+  arch-meson harfbuzz build \
     --libdir=/usr/lib32 \
-    --with-cairo \
-    --with-freetype \
-    --with-glib \
-    --with-gobject \
-    --without-graphite2 \
-    --with-icu \
-    --disable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+    -D introspection=disabled \
+    -D gtk_doc=disabled
+  meson compile -C build
 }
 
 check() {
-  cd harfbuzz
-  TMPDIR="$srcdir" make check
+  TMPDIR="$srcdir" meson test -C build --print-errorlogs
   rm -rf "$srcdir"/tmp*
 }
 
@@ -56,17 +47,15 @@
            libgobject-2.0.so harfbuzz)
   provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
 
-  cd harfbuzz
-  make DESTDIR="$pkgdir" install
-
+  DESTDIR="$pkgdir" meson install -C build
   rm -rf "${pkgdir}"/usr/{include,share,bin}
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+  # Split harfbuzz-icu
+  mkdir -p hb-icu/usr/lib32/pkgconfig
+  mv -t hb-icu/usr/lib32 "$pkgdir"/usr/lib32/libharfbuzz-icu*
+  mv -t hb-icu/usr/lib32/pkgconfig "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc
 
-# Split harfbuzz-icu
-  mkdir -p ../hb-icu/usr/lib32/pkgconfig; cd ../hb-icu
-  mv "$pkgdir"/usr/lib32/libharfbuzz-icu* ./usr/lib32
-  mv "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc ./usr/lib32/pkgconfig
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
 }
 
 package_lib32-harfbuzz-icu() {