Date: Thursday, October 20, 2022 @ 23:59:34 Author: heftig Revision: 1333030
5.3.1-1 Modified: lib32-harfbuzz/trunk/PKGBUILD ----------+ PKGBUILD | 60 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-20 23:46:15 UTC (rev 1333029) +++ PKGBUILD 2022-10-20 23:59:34 UTC (rev 1333030) @@ -3,17 +3,28 @@ pkgbase=lib32-harfbuzz pkgname=(lib32-harfbuzz lib32-harfbuzz-icu) -pkgver=5.3.0 +pkgver=5.3.1 pkgrel=1 pkgdesc="OpenType text shaping engine - 32-bit" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" arch=(x86_64) license=(MIT) -makedepends=(lib32-glib2 lib32-freetype2 lib32-icu ragel git python meson - harfbuzz) -checkdepends=(python-fonttools python-setuptools) +makedepends=( + git + harfbuzz + lib32-freetype2 + lib32-glib2 + lib32-icu + meson + python + ragel +) +checkdepends=( + python-fonttools + python-setuptools +) options=(debug) -_commit=3ce4b8f5c94fe351165243b209ccb9759917f5cb # tags/5.3.0^0 +_commit=970321db7bddbe8c579b73751fc655a924ea3ce6 # tags/5.3.1^0 source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit") sha256sums=('SKIP') @@ -24,9 +35,20 @@ prepare() { cd harfbuzz + + # https://github.com/harfbuzz/harfbuzz/issues/3850 + git cherry-pick -n b0b7a65388da25ae3fa01e969ad6abc67eed4f49 } build() { + local meson_options=( + --libdir=/usr/lib32 + -D cairo=disabled + -D chafa=disabled + -D introspection=disabled + -D docs=disabled + ) + export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" @@ -35,12 +57,7 @@ CFLAGS="${CFLAGS/-fexceptions/}" CXXFLAGS="${CXXFLAGS/-fexceptions/}" - arch-meson harfbuzz build \ - --libdir=/usr/lib32 \ - -D cairo=disabled \ - -D chafa=disabled \ - -D introspection=disabled \ - -D docs=disabled + arch-meson harfbuzz build "${meson_options[@]}" meson compile -C build } @@ -61,9 +78,15 @@ } 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) + depends=( + harfbuzz + lib32-freetype2 + lib32-glib2 + libfreetype.so + libglib-2.0.so + libgobject-2.0.so + ) + provides=(libharfbuzz{,-subset,-gobject}.so) meson install -C build --destdir "$pkgdir" @@ -79,7 +102,12 @@ package_lib32-harfbuzz-icu() { pkgdesc+=" - ICU integration" - depends=("lib32-harfbuzz=$pkgver-$pkgrel" libicuuc.so libharfbuzz.so harfbuzz-icu) + depends=( + "lib32-harfbuzz=$pkgver-$pkgrel" + harfbuzz-icu + libharfbuzz.so + libicuuc.so + ) provides=(libharfbuzz-icu.so) mv hb-icu/* "$pkgdir" @@ -86,3 +114,5 @@ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING } + +# vim:set sw=2 sts=-1 et:
