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

[Jan Steffens]

    Date: Wednesday, November 3, 2021 @ 23:20:18
  Author: heftig
Revision: 1035774

3.1.0-1

Modified:
  lib32-harfbuzz/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-03 23:19:25 UTC (rev 1035773)
+++ PKGBUILD	2021-11-03 23:20:18 UTC (rev 1035774)
@@ -3,9 +3,9 @@
 
 pkgbase=lib32-harfbuzz
 pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
-pkgdesc="OpenType text shaping engine (32-bit)"
+pkgdesc="OpenType text shaping engine - 32-bit"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 arch=(x86_64)
 license=(MIT)
@@ -12,7 +12,7 @@
 makedepends=(lib32-glib2 lib32-freetype2 lib32-icu ragel git python meson
              harfbuzz)
 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')
 
@@ -45,6 +45,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_lib32-harfbuzz() {
   depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
            libgobject-2.0.so harfbuzz)
@@ -51,19 +61,20 @@
   provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
 
   meson install -C build --destdir "$pkgdir"
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
 
-  # 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
+  ( cd "$pkgdir"
+    rm -r usr/{bin,include}
 
+    _pick hb-icu usr/lib32/libharfbuzz-icu*
+    _pick hb-icu usr/lib32/pkgconfig/harfbuzz-icu.pc
+  )
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
 }
 
 package_lib32-harfbuzz-icu() {
-  pkgdesc="$pkgdesc (ICU integration)"
-  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
+  pkgdesc+=" - ICU integration"
+  depends=("lib32-harfbuzz=$pkgver-$pkgrel" libicuuc.so libharfbuzz.so harfbuzz-icu)
   provides=(libharfbuzz-icu.so)
 
   mv hb-icu/* "$pkgdir"