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

[Jan Steffens]

    Date: Wednesday, November 3, 2021 @ 23:20:16
  Author: heftig
Revision: 427091

3.1.0-1

Modified:
  harfbuzz/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-03 22:31:24 UTC (rev 427090)
+++ PKGBUILD	2021-11-03 23:20:16 UTC (rev 427091)
@@ -3,7 +3,7 @@
 
 pkgbase=harfbuzz
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -12,7 +12,7 @@
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc
              ragel git python meson chafa)
 checkdepends=(python-fonttools python-setuptools)
-_commit=9c387e20d65a7a366ac270d789f6ad266014c9e0  # tags/3.0.0^0
+_commit=77eeec53a917554a2766a7cb1687607841282777  # tags/3.1.0^0
 source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -27,7 +27,7 @@
 
 build() {
   arch-meson harfbuzz build \
-    -D graphite=enabled
+    -D graphite2=enabled
   meson compile -C build
 }
 
@@ -37,6 +37,16 @@
   rm -r tmp
 }
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 package_harfbuzz() {
   depends=(glib2 freetype2 graphite libglib-2.0.so libfreetype.so
            libgobject-2.0.so)
@@ -46,18 +56,19 @@
 
   meson install -C build --destdir "$pkgdir"
 
-  # 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
+  ( cd "$pkgdir"
 
+    _pick hb-icu usr/lib/libharfbuzz-icu*
+    _pick hb-icu usr/lib/pkgconfig/harfbuzz-icu.pc
+    _pick hb-icu usr/include/harfbuzz/hb-icu.h
+  )
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
 }
 
 package_harfbuzz-icu() {
-  pkgdesc="$pkgdesc (ICU integration)"
-  depends=("harfbuzz=$pkgver-$pkgrel" icu libharfbuzz.so)
+  pkgdesc+=" - ICU integration"
+  depends=("harfbuzz=$pkgver-$pkgrel" libicuuc.so libharfbuzz.so)
   provides=(libharfbuzz-icu.so)
 
   mv hb-icu/* "$pkgdir"