Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
freetype-harfbuzz: bump to 2.10.2+2.7.0, swap to meson.
Browse files Browse the repository at this point in the history
The harfbuzz upstream have decided to no longer publish release
tarballs (which contained pre-generated autotools stuff). This
commit swaps to using meson (as is recommended upstream) to
prevent adding a dependency on autotools.
  • Loading branch information
dylanaraps committed Jul 27, 2020
1 parent b33560d commit 2e5271c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
22 changes: 14 additions & 8 deletions extra/freetype-harfbuzz/build
Expand Up @@ -16,14 +16,20 @@ build_freetype() (
build_harfbuzz() (
cd harfbuzz

./configure \
--prefix=/usr \
--with-glib=yes \
--with-icu=no \
--with-cairo=no
export DESTDIR="$1"

make
make DESTDIR="$1" install
meson \
--default-library=both \
--prefix=/usr \
-Dfreetype=enabled \
-Dglib=enabled \
-Dicu=disabled \
-Dbenchmark=disabled \
-Dtests=disabled \
. output

ninja -C output
ninja -C output install
)

build_freetype "$1" no
Expand All @@ -36,6 +42,6 @@ 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
2 changes: 1 addition & 1 deletion 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
1 change: 1 addition & 0 deletions extra/freetype-harfbuzz/depends
Expand Up @@ -13,5 +13,6 @@ libpng
libxcb
libxshmfence
mesa
meson make
pixman
zlib
2 changes: 1 addition & 1 deletion 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
2 changes: 1 addition & 1 deletion extra/freetype-harfbuzz/version
@@ -1 +1 @@
2.10.2+2.6.8 1
2.10.2+2.7.0 1

0 comments on commit 2e5271c

Please sign in to comment.