From 0ebc3c75bc2553bc07a98c25c5455ba894cd7c87 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 17 Oct 2023 07:21:25 +0000 Subject: [PATCH] harfbuzz, bump version, fix build for pango (#9611) --- ...uzz-7.3.0.recipe => harfbuzz-8.2.1.recipe} | 51 ++++++------------- ...7.3.0.patchset => harfbuzz-8.2.1.patchset} | 41 +++++++-------- 2 files changed, 37 insertions(+), 55 deletions(-) rename media-libs/harfbuzz/{harfbuzz-7.3.0.recipe => harfbuzz-8.2.1.recipe} (77%) rename media-libs/harfbuzz/patches/{harfbuzz-7.3.0.patchset => harfbuzz-8.2.1.patchset} (58%) diff --git a/media-libs/harfbuzz/harfbuzz-7.3.0.recipe b/media-libs/harfbuzz/harfbuzz-8.2.1.recipe similarity index 77% rename from media-libs/harfbuzz/harfbuzz-7.3.0.recipe rename to media-libs/harfbuzz/harfbuzz-8.2.1.recipe index d0be32ba2..842caf718 100644 --- a/media-libs/harfbuzz/harfbuzz-7.3.0.recipe +++ b/media-libs/harfbuzz/harfbuzz-8.2.1.recipe @@ -18,7 +18,7 @@ COPYRIGHT="2004-2018 Behdad Esfahbod LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz" -CHECKSUM_SHA256="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb" +CHECKSUM_SHA256="0fec78f98c9c8faf228957a201c8846f809452c20f8445eb092a1ba6f22dbea5" PATCHES="harfbuzz-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -31,7 +31,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion="0.60730.0" +libVersion="0.60821.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -42,14 +42,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgraphite2$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix " SUMMARY_glib="$SUMMARY (glib)" @@ -58,68 +53,51 @@ DESCRIPTION_glib="$DESCRIPTION (glib)" PROVIDES_glib=" harfbuzz${secondaryArchSuffix}_glib = $portVersion compat >= 0.9 lib:libharfbuzz_gobject$secondaryArchSuffix = $libVersionCompat + devel:libharfbuzz_gobject$secondaryArchSuffix = $libVersionCompat " REQUIRES_glib=" haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix + harfbuzz$secondaryArchSuffix == $portVersion lib:libfreetype$secondaryArchSuffix - lib:libgio_2.0$secondaryArchSuffix - lib:libgirepository_1.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix - lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix lib:libgraphite2$secondaryArchSuffix - lib:libharfbuzz$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix " PROVIDES_devel=" harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 devel:libharfbuzz$secondaryArchSuffix = $libVersionCompat - devel:libharfbuzz_gobject$secondaryArchSuffix = $libVersionCompat devel:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat devel:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" harfbuzz$secondaryArchSuffix == $portVersion base devel:libfreetype$secondaryArchSuffix - devel:libgio_2.0$secondaryArchSuffix - devel:libgirepository_1.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix >= 6.18.1 - devel:libgio_2.0$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix devel:libgirepository_1.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix >= 66 - devel:libintl$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:cmake cmd:gcc$secondaryArchSuffix - cmd:grep cmd:gtkdoc_scan cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:meson >= 0.55.0 cmd:ninja cmd:pkg_config$secondaryArchSuffix cmd:python3 - cmd:ragel$secondaryArchSuffix - cmd:sed - cmd:which + pygments_python310 " defineDebugInfoPackage harfbuzz$secondaryArchSuffix \ @@ -138,13 +116,14 @@ BUILD() --infodir=$infoDir \ --datadir=$dataDir \ --bindir="$commandBinDir" \ + -Dcairo=disabled \ -Dglib=disabled \ -Dicu=enabled \ -Dintrospection=enabled \ -Dgraphite2=enabled \ -Dgobject=enabled \ -Ddocs=enabled \ - -Dtests=enabled \ + -Dtests=disabled \ haiku_build ninja -C haiku_build $jobArgs } @@ -173,11 +152,13 @@ INSTALL() packageEntries glib \ "$dataDir" \ "$libDir"/girepository-1.0 \ - "$libDir"/libharfbuzz-gobject.so* + "$libDir"/libharfbuzz-gobject.so* \ + "$developLibDir"/pkgconfig/harfbuzz-gobject.pc \ + "$developLibDir"/libharfbuzz-gobject.so* # devel package packageEntries devel \ - "$docDir" \ + "$documentationDir" \ "$developDir" \ "$libDir"/cmake } diff --git a/media-libs/harfbuzz/patches/harfbuzz-7.3.0.patchset b/media-libs/harfbuzz/patches/harfbuzz-8.2.1.patchset similarity index 58% rename from media-libs/harfbuzz/patches/harfbuzz-7.3.0.patchset rename to media-libs/harfbuzz/patches/harfbuzz-8.2.1.patchset index efd371345..2f9afbd2a 100644 --- a/media-libs/harfbuzz/patches/harfbuzz-7.3.0.patchset +++ b/media-libs/harfbuzz/patches/harfbuzz-8.2.1.patchset @@ -1,28 +1,9 @@ From 46c722cfdb47f7255236d4fd5db8d7442f673e6f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 5 Jan 2021 15:32:02 +0100 -Subject: Patch testsuite scripts after Python migration +Subject: Patch testsuite script after Python migration -diff --git a/src/check-libstdc++.py b/src/check-libstdc++.py -index e70d5f8..78768fc 100755 ---- a/src/check-libstdc++.py -+++ b/src/check-libstdc++.py -@@ -12,8 +12,12 @@ if not ldd: - if otool: - ldd = otool + ' -L' - else: -- print ('check-libstdc++.py: \'ldd\' not found; skipping test') -- sys.exit (77) -+ ldd = shutil.which ('readelf') -+ if ldd: -+ ldd = [ldd, '-d'] -+ else: -+ print ('check-libstdc++.py: \'ldd\' not found; skipping test') -+ sys.exit (77) - - stat = 0 - tested = False diff --git a/src/check-symbols.py b/src/check-symbols.py index 91bf8b0..c2e0511 100755 --- a/src/check-symbols.py @@ -39,3 +20,23 @@ index 91bf8b0..c2e0511 100755 -- 2.37.3 + +From 8944cad529bc77c4601f8a97efc0e902f045c9a3 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 11 Oct 2023 10:45:36 +0200 +Subject: Disable tests, ERROR: Unknown variable "hb_shape" + + +diff --git a/test/meson.build b/test/meson.build +index 371b7ef..bc2085a 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -1,5 +1,3 @@ + subdir('api') +-subdir('shape') +-subdir('subset') + subdir('fuzzing') + subdir('threads') +-- +2.42.0 +