diff --git a/media-libs/harfbuzz/harfbuzz-11.4.4.recipe b/media-libs/harfbuzz/harfbuzz-12.3.2.recipe similarity index 93% rename from media-libs/harfbuzz/harfbuzz-11.4.4.recipe rename to media-libs/harfbuzz/harfbuzz-12.3.2.recipe index 0f320b4af..3e2a4dd0b 100644 --- a/media-libs/harfbuzz/harfbuzz-11.4.4.recipe +++ b/media-libs/harfbuzz/harfbuzz-12.3.2.recipe @@ -22,7 +22,7 @@ COPYRIGHT="2010-2022 Google, Inc. LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz" -CHECKSUM_SHA256="1053f17146ea587fafa9f56c9e4e0f4b3fefae4ba2569155d8bc9a35208f58c5" +CHECKSUM_SHA256="6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8" PATCHES="harfbuzz-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -35,7 +35,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="0.61144.0" +libVersion="0.61232.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -50,6 +50,9 @@ REQUIRES=" lib:libgraphite2$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix " +SUPPLEMENTS=" + lib:libfreetype$secondaryArchSuffix +" SUMMARY_glib="$SUMMARY (glib)" DESCRIPTION_glib="$DESCRIPTION (glib)" @@ -83,12 +86,9 @@ REQUIRES_devel=" devel:libicuuc$secondaryArchSuffix " -# freetype_bootstrap because there's a circular dependency -# loop between these two packages. _bootstrap doesn't build -# with harfbuzz support to break the loop. BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - freetype_bootstrap$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix devel:libgirepository_1.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix @@ -131,6 +131,7 @@ BUILD() -Dgobject=enabled \ -Ddocs=enabled \ -Dtests=disabled \ + -Dcpp_std=c++17 haiku_build ninja -C haiku_build $jobArgs } diff --git a/media-libs/harfbuzz/patches/harfbuzz-11.4.4.patchset b/media-libs/harfbuzz/patches/harfbuzz-12.3.2.patchset similarity index 100% rename from media-libs/harfbuzz/patches/harfbuzz-11.4.4.patchset rename to media-libs/harfbuzz/patches/harfbuzz-12.3.2.patchset