From baf0829aaf15a984953162e736cfc181c0580faa Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 28 Jul 2020 00:19:19 +0300
Subject: [PATCH] freetype-harfbuzz: Fix build.

Harfbuzz wasn't linking to Freetype if it was not already installed.
---
 extra/freetype-harfbuzz/build   | 16 ++++++++--------
 extra/freetype-harfbuzz/version |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build
index bf6ec277..40560d0e 100755
--- a/extra/freetype-harfbuzz/build
+++ b/extra/freetype-harfbuzz/build
@@ -14,18 +14,23 @@ build_freetype() (
 )
 
 build_harfbuzz() (
+    # Point Harfbuzz to the Freetype files.
+    export CFLAGS="$CFLAGS -I$1/usr/include/freetype2"
+    export CXXFLAGS="$CXXFLAGS -I$1/usr/include/freetype2"
+    export LDFLAGS="$LDFLAGS -L$1/usr/lib"
+
     cd harfbuzz
 
     export DESTDIR="$1"
-
     meson \
-        --default-library=both \
         --prefix=/usr \
-        -Dfreetype=enabled \
         -Dglib=enabled \
+        -Dfreetype=enabled \
+        -Ddefault_library=both \
         -Dicu=disabled \
         -Dbenchmark=disabled \
         -Dtests=disabled \
+        -Dpkg_config_path="$1/usr/lib/pkgconfig" \
         . output
 
     ninja -C output
@@ -33,11 +38,6 @@ build_harfbuzz() (
 )
 
 build_freetype "$1" no
-
-# Point Harfbuzz to the Freetype files.
-export FREETYPE_CFLAGS="-I$PWD/freetype/include"
-export FREETYPE_LIBS="-L$1/usr/lib -lfreetype"
-
 build_harfbuzz "$1"
 
 # Point Freetype to the Harfbuzz files.
diff --git a/extra/freetype-harfbuzz/version b/extra/freetype-harfbuzz/version
index 472da395..e30c6bd2 100644
--- a/extra/freetype-harfbuzz/version
+++ b/extra/freetype-harfbuzz/version
@@ -1 +1 @@
-2.10.2+2.7.0 1
+2.10.2+2.7.0 2