From 48f61878bed2352da458d02c5d2d3c2320c3c41e Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Mon, 27 Jun 2022 14:26:11 -0500 Subject: [PATCH] freetype-harfbuzz: 2.12.1+4.4.0 --- extra/freetype-harfbuzz/build | 8 +++----- extra/freetype-harfbuzz/checksums | 2 +- extra/freetype-harfbuzz/version | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build index 99b622b7..a45cc211 100755 --- a/extra/freetype-harfbuzz/build +++ b/extra/freetype-harfbuzz/build @@ -20,7 +20,6 @@ build_harfbuzz() ( meson \ --prefix=/usr \ - -Dpkg_config_path="$DESTDIR/usr/lib/pkgconfig" \ -Ddefault_library=both \ -Dglib=disabled \ -Dfreetype=enabled \ @@ -36,13 +35,12 @@ build_harfbuzz() ( ) # Point Freetype to the Harfbuzz files. -export CFLAGS="$CFLAGS -I$DESTDIR/usr/include/harfbuzz" -export CFLAGS="$CFLAGS -L$DESTDIR/usr/lib " +export CPPFLAGS="$CPPFLAGS -I$DESTDIR/usr/include/harfbuzz" +export LDFLAGS="$LDFLAGS -L$DESTDIR/usr/lib" export PKG_CONFIG_PATH=$DESTDIR/usr/lib/pkgconfig # Point Harfbuzz to the Freetype files. -export CXXFLAGS="$CXXFLAGS -I$DESTDIR/usr/include/freetype2" -export CXXFLAGS="$CXXFLAGS -L$DESTDIR/usr/lib" +export CPPFLAGS="$CPPFLAGS -I$DESTDIR/usr/include/freetype2" build_freetype -Dharfbuzz=disabled build_harfbuzz diff --git a/extra/freetype-harfbuzz/checksums b/extra/freetype-harfbuzz/checksums index 36fe7a16..1acbafa5 100644 --- a/extra/freetype-harfbuzz/checksums +++ b/extra/freetype-harfbuzz/checksums @@ -1,2 +1,2 @@ 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f -32184860ddc0b264ff95010e1c64e596bd746fe4c2e34014a1185340cdddeba6 +ba3559de7c7bda51f830f0b5c65d72298bbf35a14d9bb0043b05bb6f7c8b4fd8 diff --git a/extra/freetype-harfbuzz/version b/extra/freetype-harfbuzz/version index 2a35672b..7329ac80 100644 --- a/extra/freetype-harfbuzz/version +++ b/extra/freetype-harfbuzz/version @@ -1 +1 @@ -2.12.1+4.3.0 1 +2.12.1+4.4.0 1