harfbuzz: bump version

media-libs/harfbuzz/harfbuzz-2.7.4.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="2"
+REVISION="1"
 SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
-CHECKSUM_SHA256="84d0f1fb4cf4b3ee398ac20eaa608ca9f7cd90d992a44540fdcb16469bb460e5"
+CHECKSUM_SHA256="6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7"
 PATCHES="harfbuzz-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -31,7 +31,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.20600.6"
+libVersion="0.20704.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="

media-libs/harfbuzz/patches/harfbuzz-2.6.6.patchset

@@ -1,64 +0,0 @@
-From d9a15a0c58a064b65d5d0b920e0f0c495b8a3776 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:38:08 +0000
-Subject: Fix script in the test suite to better filter the output of nm.
-
-src/check-symbols.sh compares the list of symbols in libharfbuzz.so against
-a known list, $IGNORED_SYMBOLS, but Haiku has 2 symbols which are missing
-in this list: _gSharedObjectHaiku{ABI,Version}.
-
-diff --git a/src/check-symbols.sh b/src/check-symbols.sh
-index a6ca1c2..fbf29b7 100755
---- a/src/check-symbols.sh
-+++ b/src/check-symbols.sh
-@@ -8,7 +8,7 @@ test -z "$builddir" && builddir=.
- test -z "$libs" && libs=.libs
- stat=0
- 
--IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_.*\|llvm_.*\|flush_fn_list\|writeout_fn_list'
-+IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_.*\|llvm_.*\|flush_fn_list\|writeout_fn_list\|_gSharedObjectHaikuABI\|_gSharedObjectHaikuVersion'
- 
- if which nm 2>/dev/null >/dev/null; then
- 	:
--- 
-2.24.0
-
-
-From ce8b56c27a987f6233ee1ddb1205f518d5eb4fd1 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:39:08 +0000
-Subject: Patch src/check-libstdc++.sh to use objdump instead of ldd.
-
-
-diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh
-index a7b4c49..d39fa2c 100755
---- a/src/check-libstdc++.sh
-+++ b/src/check-libstdc++.sh
-@@ -10,10 +10,15 @@ stat=0
- 
- if which ldd 2>/dev/null >/dev/null; then
- 	LDD=ldd
-+	GREP_NEEDED=cat
- else
- 	# macOS specific tool
- 	if which otool 2>/dev/null >/dev/null; then
- 		LDD="otool -L"
-+		GREP_NEEDED=cat
-+	elif which objdump 2>/dev/null >/dev/null; then
-+		LDD="objdump -x"
-+		GREP_NEEDED="grep NEEDED"
- 	else
- 		echo "check-libstdc++.sh: 'ldd' not found; skipping test"
- 		exit 77
-@@ -28,7 +33,7 @@ for soname in harfbuzz harfbuzz-subset harfbuzz-gobject; do
- 		if ! test -f "$so"; then continue; fi
- 
- 		echo "Checking that we are not linking to libstdc++ or libc++ in $so"
--		if $LDD $so | grep 'libstdc[+][+]\|libc[+][+]'; then
-+		if $LDD $so | $GREP_NEEDED | grep 'libstdc[+][+]\|libc[+][+]'; then
- 			echo "Ouch, linked to libstdc++ or libc++"
- 			stat=1
- 		fi
--- 
-2.24.0
-

media-libs/harfbuzz/patches/harfbuzz-2.7.4.patchset

@@ -0,0 +1,42 @@
+From 5d399a2b7b64d0cd143fe4a37e623de802086523 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 200c683..5c1d7b9 100755
+--- a/src/check-libstdc++.py
++++ b/src/check-libstdc++.py
+@@ -14,8 +14,12 @@ else:
+ 	if ldd:
+ 		ldd = [ldd, '-L'] # 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 c366dc0..3a730ba 100755
+--- a/src/check-symbols.py
++++ b/src/check-symbols.py
+@@ -9,7 +9,8 @@ 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'])
++	'__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path',
++	'_gSharedObjectHaikuABI', '_gSharedObjectHaikuVersion'])
+ 
+ nm = shutil.which ('nm')
+ if not nm:
+-- 
+2.30.0
+