diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build index 40560d0e..d42d5ac0 100755 --- a/extra/freetype-harfbuzz/build +++ b/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 diff --git a/extra/freetype-harfbuzz/sources b/extra/freetype-harfbuzz/sources index 60a3685d..3be3f34e 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/archive/2.7.0.tar.gz harfbuzz +https://github.com/harfbuzz/harfbuzz/releases/download/2.6.8/harfbuzz-2.6.8.tar.xz harfbuzz diff --git a/extra/freetype-harfbuzz/version b/extra/freetype-harfbuzz/version index e30c6bd2..72ae36a8 100644 --- a/extra/freetype-harfbuzz/version +++ b/extra/freetype-harfbuzz/version @@ -1 +1 @@ -2.10.2+2.7.0 2 +2.10.2+2.6.8 1