From 815fc034ff89f594a7221600d5195e1fa92411c1 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sun, 2 Jul 2023 07:48:00 +0200 Subject: [PATCH] Ports: Fix building harfbuzz against freetype --- Ports/harfbuzz/package.sh | 7 ++++- .../patches/0002-Build-against-freetype.patch | 26 +++++++++++++++++++ Ports/harfbuzz/patches/ReadMe.md | 5 ++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Ports/harfbuzz/patches/0002-Build-against-freetype.patch diff --git a/Ports/harfbuzz/package.sh b/Ports/harfbuzz/package.sh index b4681f7039..f087a6d25f 100755 --- a/Ports/harfbuzz/package.sh +++ b/Ports/harfbuzz/package.sh @@ -5,7 +5,12 @@ files="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuz useconfigure='true' auth_type='sha256' depends=("freetype" "libicu") -configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DHB_HAVE_FREETYPE=ON" "-DHB_HAVE_ICU=ON") +configopts=( + "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" + '-DHB_HAVE_FREETYPE=ON' + '-DHB_HAVE_ICU=ON' + '-DCMAKE_C_FLAGS=-lfreetype' +) configure() { run mkdir -p build diff --git a/Ports/harfbuzz/patches/0002-Build-against-freetype.patch b/Ports/harfbuzz/patches/0002-Build-against-freetype.patch new file mode 100644 index 0000000000..a2f623bff3 --- /dev/null +++ b/Ports/harfbuzz/patches/0002-Build-against-freetype.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dominika Liberda +Date: Tue, 13 Jun 2023 23:09:19 +0200 +Subject: [PATCH] Build against freetype + +--- + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a1d9032fcde002c27ab5b06c9665c1ca843d13a..c654284a3e6b9511b0433b8c0d25fccb57df30fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,10 +37,8 @@ option(HB_HAVE_FREETYPE "Enable freetype interop helpers" OFF) + option(HB_HAVE_GRAPHITE2 "Enable Graphite2 complementary shaper" OFF) + option(HB_HAVE_GLIB "Enable glib unicode functions" OFF) + option(HB_HAVE_ICU "Enable icu unicode functions" OFF) +-if (TARGET freetype) +- set (HB_HAVE_FREETYPE ON) +- add_definitions(-DHAVE_FREETYPE=1) +-endif () ++set (HB_HAVE_FREETYPE ON) ++add_definitions(-DHAVE_FREETYPE=1) + if (APPLE) + option(HB_HAVE_CORETEXT "Enable CoreText shaper backend on macOS" ON) + set (CMAKE_MACOSX_RPATH ON) diff --git a/Ports/harfbuzz/patches/ReadMe.md b/Ports/harfbuzz/patches/ReadMe.md index f8463201cc..c6a61d2a30 100644 --- a/Ports/harfbuzz/patches/ReadMe.md +++ b/Ports/harfbuzz/patches/ReadMe.md @@ -5,3 +5,8 @@ Mark a possibly-unused variable as [[maybe_unused]] +## `0002-Build-against-freetype.patch` + +Build against freetype + +