freetype-harfbuzz: revert to 2.10.2+2.6.8

The swap to meson also causes the libtool .la files to no longer
exist as libtool is only called in the autotools build. We swapped
to meson as upstream will no longer publish release tarballs.

The removal of these files causes any other packages which both
link to harfbuzz and use autotools to fail to build. This package
is being reverted to prevent these issues.

A permanent fix is coming next. All .la files will be removed by
the package manager post build. This will prevent the issue from
ever arising again as well as dropping unneeded files from a
myriad of packages.

extra/freetype-harfbuzz/build

@@ -14,34 +14,27 @@ 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 \
+    ./configure \
         --prefix=/usr \
-        -Dglib=enabled \
-        -Dfreetype=enabled \
-        -Ddefault_library=both \
-        -Dicu=disabled \
-        -Dbenchmark=disabled \
-        -Dtests=disabled \
-        -Dpkg_config_path="$1/usr/lib/pkgconfig" \
-        . output
+        --with-glib=yes \
+        --with-icu=no
 
-    ninja -C output
-    ninja -C output install
+    make
+    make DESTDIR="$1" install
 )
 
 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$PWD/harfbuzz/output/src -lharfbuzz"
+export HARFBUZZ_LIBS="-L$PWD/harfbuzz/src/.libs -lharfbuzz"
 
 build_freetype "$1" yes

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/archive/2.7.0.tar.gz harfbuzz
+https://github.com/harfbuzz/harfbuzz/releases/download/2.6.8/harfbuzz-2.6.8.tar.xz harfbuzz

extra/freetype-harfbuzz/version

@@ -1 +1 @@
-2.10.2+2.7.0 2
+2.10.2+2.6.8 1