From 1ec01c019a59f21f247707adef62c641d12e9ebd Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Fri, 31 Mar 2023 07:48:06 +0530
Subject: [PATCH] Upgraded gtk/harfbuzz to 7.1.0

---
 gtk/harfbuzz/harfbuzz-old-gcc-header.patch | 10 --------
 gtk/harfbuzz/harfbuzz.SMBuild              | 29 ++++++++--------------
 2 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 gtk/harfbuzz/harfbuzz-old-gcc-header.patch

diff --git a/gtk/harfbuzz/harfbuzz-old-gcc-header.patch b/gtk/harfbuzz/harfbuzz-old-gcc-header.patch
deleted file mode 100644
index 3b55de1..0000000
--- a/gtk/harfbuzz/harfbuzz-old-gcc-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/hb.hh	2021-06-12 14:41:53.319988433 +0530
-+++ b/src/hb.hh	2021-06-12 14:42:15.518990104 +0530
-@@ -107,6 +107,7 @@
- #pragma GCC diagnostic warning "-Wmaybe-uninitialized"
- #pragma GCC diagnostic warning "-Wmissing-format-attribute"
- #pragma GCC diagnostic warning "-Wundef"
-+#pragma GCC diagnostic warning "-Wunused-but-set-variable"
- #endif
- 
- /* Ignored currently, but should be fixed at some point. */
diff --git a/gtk/harfbuzz/harfbuzz.SMBuild b/gtk/harfbuzz/harfbuzz.SMBuild
index 9afaed5..d2d2eec 100755
--- a/gtk/harfbuzz/harfbuzz.SMBuild
+++ b/gtk/harfbuzz/harfbuzz.SMBuild
@@ -1,6 +1,6 @@
 app=harfbuzz
-version=2.6.4
-build=2sml
+version=7.1.0
+build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 download="https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$version.tar.gz"
 desc="OpenType text shaping engine"
@@ -13,29 +13,22 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
-
-  # https://github.com/harfbuzz/harfbuzz/issues/2555
-  # https://github.com/harfbuzz/harfbuzz/commit/bb37df76949802214323d7cd5454cd19bfb73a00
-  applypatch $srcdir/harfbuzz-old-gcc-header.patch
 }
 
 build() {
-  ./configure \
-    --prefix="" \
-    --disable-static \
-    --with-glib \
-    --with-icu=yes \
-    --with-graphite2=yes
+  mkdir -p smbuild && cd smbuild
+  meson .. \
+    --prefix="/" \
+    -Dgraphite2=enabled
 
-  make
-  make install DESTDIR=$pkg
+  ninja
+  DESTDIR="$pkg" ninja install
 
-  cp COPYING $pkgdocs/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-58abedeccf214ccca4b1f53e06cbd372adbed5a02de4c29edf087b4361a7b2b7c1cd678172d8e263cc35f7f03d84a617a9e615cdb358d3045e126d0771ace348  harfbuzz-2.6.4.tar.lz
-f77e3515429554117b3c3c19ce50b74632283dc4ccf23bbedf6d1a7fe2310eb8dbb79900a30cb3585fe7a0512616698222cbe760588dc2838475597a648d461f  harfbuzz-old-gcc-header.patch
-"
+1f5735dc79c4a395faa2798eaad941b964baabedcf40bcdd6e501464c6b411ceddbddc214a67ee798a4364b57e128a92ab8b2ac5e94286158999bb42ebdd1703  harfbuzz-7.1.0.tar.lz
+"
\ No newline at end of file