From 1a8c1006e653fe299f384416a6877533bcc6f155 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Tue, 28 Jul 2020 00:08:39 +0300
Subject: freetype-harfbuzz: actually fix standalone build

---
 xorg/freetype-harfbuzz/build   | 19 +++++++++++--------
 xorg/freetype-harfbuzz/version |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'xorg')

diff --git a/xorg/freetype-harfbuzz/build b/xorg/freetype-harfbuzz/build
index fdca407a..9fb13d97 100755
--- a/xorg/freetype-harfbuzz/build
+++ b/xorg/freetype-harfbuzz/build
@@ -14,18 +14,24 @@ build_freetype() (
 )
 
 build_harfbuzz() (
-    export DESTDIR="$1"
-    export CFLAGS="$CFLAGS -I$PWD/freetype/include"
-    export LIBS="-L$1/usr/lib -lfreetype"
-    cd 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 \
         --prefix=/usr \
         -Dglib=enabled \
+        -Dfreetype=enabled \
         -Ddefault_library=both \
         -Dicu=disabled \
         -Dbenchmark=disabled \
+        -Dtests=disabled \
+        -Dpkg_config_path="$1/usr/lib/pkgconfig" \
         . output
 
     ninja -C output
@@ -34,14 +40,11 @@ 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.
 export HARFBUZZ_CFLAGS="-I$PWD/harfbuzz/src"
-export HARFBUZZ_LIBS="-L$1/usr/lib -lharfbuzz"
+export HARFBUZZ_LIBS="-L$PWD/harfbuzz/output/src -lharfbuzz"
 
 build_freetype "$1" yes
diff --git a/xorg/freetype-harfbuzz/version b/xorg/freetype-harfbuzz/version
index 472da395..e30c6bd2 100644
--- a/xorg/freetype-harfbuzz/version
+++ b/xorg/freetype-harfbuzz/version
@@ -1 +1 @@
-2.10.2+2.7.0 1
+2.10.2+2.7.0 2
-- 
cgit v1.2.3