diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build index d42d5ac0..86c7a481 100755 --- a/extra/freetype-harfbuzz/build +++ b/extra/freetype-harfbuzz/build @@ -14,27 +14,35 @@ 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 - ./configure \ + export DESTDIR="$1" + meson \ --prefix=/usr \ - --with-glib=yes \ - --with-icu=no + -Dpkg_config_path="$1/usr/lib/pkgconfig" \ + -Ddefault_library=both \ + -Dglib=enabled \ + -Dfreetype=enabled \ + -Dcairo=disabled \ + -Dicu=disabled \ + -Dbenchmark=disabled \ + -Dtests=disabled \ + . output - make - make DESTDIR="$1" install + ninja -C output + ninja -C output 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/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/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