harfbuzz: bump version (#8647)

2026-04-22 11:40:06 +02:00 · 2023-05-15 22:51:22 -07:00
parent 8671caf547
commit f46b07de04
4 changed files with 9 additions and 181 deletions
--- a/media-libs/harfbuzz/harfbuzz-3.4.0.recipe
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0.recipe
@@ -1,131 +0,0 @@
-SUMMARY="An OpenType text shaping engine"
-DESCRIPTION="HarfBuzz is an OpenType text shaping engine. It is used to \
-layout complex text such as the Indic and Arabic alphabets."
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz/"
-COPYRIGHT="2004-2018 Behdad Esfahbod
-	2000-2005 Owen Taylor
-	2013, 2015-2017 Khaled Hosny
-	2010,2011,2012 Google, Inc.
-	2012 Mozilla Foundation
-	2011 Codethink Limited
-	2008,2010 Nokia Corporation and/or its subsidiary(-ies)
-	2009 Keith Stribley
-	2009 Martin Hosken and SIL International
-	2007 Chris Wilson
-	2005 David Turner
-	2004,2007,2008,2009,2010 Red Hat, Inc.
-	1998-2004 David Turner and Werner Lemberg"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
-CHECKSUM_SHA256="7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952"
-PATCHES="harfbuzz-$portVersion.patchset"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-libVersion="0.30400.0"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
-PROVIDES="
-	harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9
-	lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat
-	lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat
-	lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libgraphite2$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libicuuc$secondaryArchSuffix >= 66
-	lib:libintl$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9
-	devel:libharfbuzz$secondaryArchSuffix = $libVersionCompat
-	devel:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat
-	devel:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
-	harfbuzz$secondaryArchSuffix == $portVersion base
-	devel:libfreetype$secondaryArchSuffix
-	devel:libgraphite2$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libbz2$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix >= 6.18.1
-	devel:libgraphite2$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
-	devel:libicuuc$secondaryArchSuffix >= 66
-	devel:libintl$secondaryArchSuffix
-	devel:libpng16$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:grep
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3
-	cmd:ragel$secondaryArchSuffix
-	cmd:sed
-	cmd:which
-	"
-
-defineDebugInfoPackage harfbuzz$secondaryArchSuffix \
-	"$libDir"/libharfbuzz.so.$libVersion \
-	"$libDir"/libharfbuzz-icu.so.$libVersion \
-	"$libDir"/libharfbuzz-subset.so.$libVersion
-
-BUILD()
-{
-	autoreconf -fi
-	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
-		--with-graphite2=yes --with-icu --without-glib
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# remove libtool library files
-	rm -f "$libDir"/libharfbuzz*.la
-
-	prepareInstalledDevelLibs \
-		libharfbuzz \
-		libharfbuzz-icu \
-		libharfbuzz-subset \
-
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		"$dataDir" \
-		"$developDir" \
-		"$libDir"/cmake
-}
-
-TEST()
-{
-	make check
-}
--- a/media-libs/harfbuzz/harfbuzz-7.3.0.recipe
+++ b/media-libs/harfbuzz/harfbuzz-7.3.0.recipe
@@ -16,9 +16,9 @@ COPYRIGHT="2004-2018 Behdad Esfahbod
 	2004,2007,2008,2009,2010 Red Hat, Inc.
 	1998-2004 David Turner and Werner Lemberg"
 LICENSE="MIT"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
-CHECKSUM_SHA256="ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7"
+CHECKSUM_SHA256="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb"
 PATCHES="harfbuzz-$portVersion.patchset"

 ARCHITECTURES="all !x86_gcc2"
@@ -31,7 +31,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi

-libVersion="0.40000.0"
+libVersion="0.60730.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

 PROVIDES="
@@ -46,7 +46,7 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libgraphite2$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libicuuc$secondaryArchSuffix >= 66
+	lib:libicuuc$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -71,7 +71,7 @@ REQUIRES_glib="
 	lib:libgraphite2$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libicuuc$secondaryArchSuffix >= 66
+	lib:libicuuc$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
--- a/media-libs/harfbuzz/patches/harfbuzz-4.0.0.patchset
+++ b/media-libs/harfbuzz/patches/harfbuzz-4.0.0.patchset
@@ -1,41 +0,0 @@
-From 449363d3cc3a4fee944742dc2309d14873ae2287 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 5 Jan 2021 15:32:02 +0100
-Subject: Patch testsuite scripts after Python migration
-
-
-diff --git a/src/check-libstdc++.py b/src/check-libstdc++.py
-index 85b7265..8e754ac 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 385959b..d92c1ec 100755
--- a/src/check-symbols.py
-+++ b/src/check-symbols.py
-@@ -10,7 +10,7 @@ libs = os.getenv ('libs', '.libs')
- IGNORED_SYMBOLS = '|'.join(['_fini', '_init', '_fdata', '_ftext', '_fbss',
- 	'__bss_start', '__bss_start__', '__bss_end__', '_edata', '_end', '_bss_end__',
- 	'__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path',
-	'lprofDirMode', 'reset_fn_list'])
-+	'lprofDirMode', 'reset_fn_list', '_gSharedObjectHaikuABI', '_gSharedObjectHaikuVersion'])
- 
- nm = os.getenv ('NM', shutil.which ('nm'))
- if not nm:
-- 
-2.30.2
-
--- a/media-libs/harfbuzz/patches/harfbuzz-7.3.0.patchset
+++ b/media-libs/harfbuzz/patches/harfbuzz-7.3.0.patchset
@@ -1,11 +1,11 @@
-From 449363d3cc3a4fee944742dc2309d14873ae2287 Mon Sep 17 00:00:00 2001
+From 46c722cfdb47f7255236d4fd5db8d7442f673e6f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 5 Jan 2021 15:32:02 +0100
 Subject: Patch testsuite scripts after Python migration


 diff --git a/src/check-libstdc++.py b/src/check-libstdc++.py
-index 85b7265..8e754ac 100755
+index e70d5f8..78768fc 100755
 --- a/src/check-libstdc++.py
 +++ b/src/check-libstdc++.py
@@ -12,8 +12,12 @@ if not ldd:
@@ -24,7 +24,7 @@ index 85b7265..8e754ac 100755
 stat = 0
 tested = False
 diff --git a/src/check-symbols.py b/src/check-symbols.py
-index 385959b..d92c1ec 100755
+index 91bf8b0..c2e0511 100755
 --- a/src/check-symbols.py
 +++ b/src/check-symbols.py
@@ -10,7 +10,7 @@ libs = os.getenv ('libs', '.libs')
@@ -37,5 +37,5 @@ index 385959b..d92c1ec 100755
 nm = os.getenv ('NM', shutil.which ('nm'))
 if not nm:
 -- 
-2.30.2
+2.37.3