From 2e5271ccde867da15bbabe4187c3321dfcc6714e Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 27 Jul 2020 16:45:56 +0300
Subject: [PATCH] freetype-harfbuzz: bump to 2.10.2+2.7.0, swap to meson.

The harfbuzz upstream have decided to no longer publish release
tarballs (which contained pre-generated autotools stuff). This
commit swaps to using meson (as is recommended upstream) to
prevent adding a dependency on autotools.
---
 extra/freetype-harfbuzz/build     | 22 ++++++++++++++--------
 extra/freetype-harfbuzz/checksums |  2 +-
 extra/freetype-harfbuzz/depends   |  1 +
 extra/freetype-harfbuzz/sources   |  2 +-
 extra/freetype-harfbuzz/version   |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build
index 93fa7d13..bf6ec277 100755
--- a/extra/freetype-harfbuzz/build
+++ b/extra/freetype-harfbuzz/build
@@ -16,14 +16,20 @@ build_freetype() (
 build_harfbuzz() (
     cd harfbuzz
 
-    ./configure \
-        --prefix=/usr \
-        --with-glib=yes \
-        --with-icu=no \
-        --with-cairo=no
+    export DESTDIR="$1"
 
-    make
-    make DESTDIR="$1" install
+    meson \
+        --default-library=both \
+        --prefix=/usr \
+        -Dfreetype=enabled \
+        -Dglib=enabled \
+        -Dicu=disabled \
+        -Dbenchmark=disabled \
+        -Dtests=disabled \
+        . output
+
+    ninja -C output
+    ninja -C output install
 )
 
 build_freetype "$1" no
@@ -36,6 +42,6 @@ build_harfbuzz "$1"
 
 # Point Freetype to the Harfbuzz files.
 export HARFBUZZ_CFLAGS="-I$PWD/harfbuzz/src"
-export HARFBUZZ_LIBS="-L$PWD/harfbuzz/src/.libs -lharfbuzz"
+export HARFBUZZ_LIBS="-L$PWD/harfbuzz/output/src -lharfbuzz"
 
 build_freetype "$1" yes
diff --git a/extra/freetype-harfbuzz/checksums b/extra/freetype-harfbuzz/checksums
index daffeea8..73dc183f 100644
--- a/extra/freetype-harfbuzz/checksums
+++ b/extra/freetype-harfbuzz/checksums
@@ -1,2 +1,2 @@
 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b  freetype-2.10.2.tar.xz
-6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035  harfbuzz-2.6.8.tar.xz
+4dba05de1fd44705f54c40d801e0e3d4833555d004cb611cc18675173feae75b  2.7.0.tar.gz
diff --git a/extra/freetype-harfbuzz/depends b/extra/freetype-harfbuzz/depends
index a7f66b10..3a0f0083 100644
--- a/extra/freetype-harfbuzz/depends
+++ b/extra/freetype-harfbuzz/depends
@@ -13,5 +13,6 @@ libpng
 libxcb
 libxshmfence
 mesa
+meson make
 pixman
 zlib
diff --git a/extra/freetype-harfbuzz/sources b/extra/freetype-harfbuzz/sources
index 3be3f34e..60a3685d 100644
--- a/extra/freetype-harfbuzz/sources
+++ b/extra/freetype-harfbuzz/sources
@@ -1,2 +1,2 @@
 https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz freetype
-https://github.com/harfbuzz/harfbuzz/releases/download/2.6.8/harfbuzz-2.6.8.tar.xz harfbuzz
+https://github.com/harfbuzz/harfbuzz/archive/2.7.0.tar.gz harfbuzz
diff --git a/extra/freetype-harfbuzz/version b/extra/freetype-harfbuzz/version
index 72ae36a8..472da395 100644
--- a/extra/freetype-harfbuzz/version
+++ b/extra/freetype-harfbuzz/version
@@ -1 +1 @@
-2.10.2+2.6.8 1
+2.10.2+2.7.0 1