Date: Thursday, October 20, 2022 @ 23:59:42
  Author: heftig
Revision: 458486

5.3.1-1

Modified:
  harfbuzz/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-20 23:46:16 UTC (rev 458485)
+++ PKGBUILD    2022-10-20 23:59:42 UTC (rev 458486)
@@ -3,17 +3,32 @@
 
 pkgbase=harfbuzz
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=5.3.0
+pkgver=5.3.1
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 url="https://www.freedesktop.org/wiki/Software/HarfBuzz";
 arch=(x86_64)
 license=(MIT)
-makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection gtk-doc
-             ragel git python meson chafa)
-checkdepends=(python-fonttools python-setuptools)
+makedepends=(
+  cairo
+  chafa
+  freetype2
+  git
+  glib2
+  gobject-introspection
+  graphite
+  gtk-doc
+  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,15 +39,20 @@
 
 prepare() {
   cd harfbuzz
+
+  # https://github.com/harfbuzz/harfbuzz/issues/3850
+  git cherry-pick -n b0b7a65388da25ae3fa01e969ad6abc67eed4f49
 }
 
 build() {
+  local meson_options=(
+    -D graphite2=enabled
+  )
   # Harfbuzz wants no exceptions
   CFLAGS="${CFLAGS/-fexceptions/}"
   CXXFLAGS="${CXXFLAGS/-fexceptions/}"
 
-  arch-meson harfbuzz build \
-    -D graphite2=enabled
+  arch-meson harfbuzz build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -53,9 +73,15 @@
 }
 
 package_harfbuzz() {
-  depends=(glib2 freetype2 graphite libglib-2.0.so libfreetype.so
-           libgobject-2.0.so)
-  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
+  depends=(
+    freetype2
+    glib2
+    graphite
+    libfreetype.so
+    libglib-2.0.so
+    libgobject-2.0.so
+  )
+  provides=(libharfbuzz{,-subset,-gobject}.so)
   optdepends=('cairo: hb-view program'
               'chafa: hb-view program')
 
@@ -73,7 +99,11 @@
 
 package_harfbuzz-icu() {
   pkgdesc+=" - ICU integration"
-  depends=("harfbuzz=$pkgver-$pkgrel" libicuuc.so libharfbuzz.so)
+  depends=(
+    "harfbuzz=$pkgver-$pkgrel"
+    libharfbuzz.so
+    libicuuc.so
+  )
   provides=(libharfbuzz-icu.so)
 
   mv hb-icu/* "$pkgdir"
@@ -80,3 +110,5 @@
 
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
 }
+
+# vim:set sw=2 sts=-1 et:

Reply via email to