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

[Jan Steffens]

    Date: Friday, April 17, 2020 @ 22:47:49
  Author: heftig
Revision: 616013

2.6.5-1

Modified:
  lib32-harfbuzz/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-17 22:03:28 UTC (rev 616012)
+++ PKGBUILD	2020-04-17 22:47:49 UTC (rev 616013)
@@ -2,16 +2,16 @@
 
 pkgbase=lib32-harfbuzz
 pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
-pkgver=2.6.4
-pkgrel=2
+pkgver=2.6.5
+pkgrel=1
 pkgdesc="OpenType text shaping engine (32-bit)"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 arch=(x86_64)
 license=(MIT)
-depends=(lib32-glib2 lib32-freetype2 harfbuzz)
-makedepends=(lib32-cairo lib32-icu gcc-multilib ragel git python)
+makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
+             harfbuzz)
 checkdepends=(python-fonttools python-setuptools)
-_commit=3a74ee528255cc027d84b204a87b5c25e47bff79  # tags/2.6.4^0
+_commit=f9bc373381ddf8553f943b774596ae5a53bf2641  # tags/2.6.5^0
 source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -28,7 +28,7 @@
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   cd harfbuzz
   ./configure \
@@ -52,14 +52,17 @@
 }
 
 package_lib32-harfbuzz() {
+  depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
+           libgobject-2.0.so harfbuzz)
+  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
 
   cd harfbuzz
   make DESTDIR="$pkgdir" install
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s harfbuzz "$pkgdir/usr/share/licenses/lib32-harfbuzz"
 
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
+
 # Split harfbuzz-icu
   mkdir -p ../hb-icu/usr/lib32/pkgconfig; cd ../hb-icu
   mv "$pkgdir"/usr/lib32/libharfbuzz-icu* ./usr/lib32
@@ -67,11 +70,11 @@
 }
 
 package_lib32-harfbuzz-icu() {
-  pkgdesc="OpenType text shaping engine (32-bit, ICU integration)"
-  depends=(lib32-harfbuzz lib32-icu harfbuzz-icu)
+  pkgdesc="$pkgdesc (ICU integration)"
+  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
+  provides=(libharfbuzz-icu.so)
 
   mv hb-icu/* "$pkgdir"
 
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s harfbuzz-icu "$pkgdir/usr/share/licenses/lib32-harfbuzz-icu"
+  install -Dm644 harfbuzz/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
 }