harfbuzz: bump version.

This commit is contained in:
Jerome Duval
2020-05-15 20:24:03 +02:00
parent dc71a27825
commit 4c9546daab
2 changed files with 13 additions and 13 deletions

View File

@@ -17,8 +17,8 @@ COPYRIGHT="2004-2018 Behdad Esfahbod
1998-2004 David Turner and Werner Lemberg"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.xz"
CHECKSUM_SHA256="9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12"
SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
CHECKSUM_SHA256="84d0f1fb4cf4b3ee398ac20eaa608ca9f7cd90d992a44540fdcb16469bb460e5"
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.4"
libVersion="0.20600.6"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="

View File

@@ -1,4 +1,4 @@
From d3a5ade5608793eb40bd472c5968d6300fc6323b Mon Sep 17 00:00:00 2001
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.
@@ -8,30 +8,30 @@ 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 f181b63..fd96f44 100755
index a6ca1c2..fbf29b7 100755
--- a/src/check-symbols.sh
+++ b/src/check-symbols.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
@@ -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_.*'
+IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_.*\|_gSharedObjectHaikuABI\|_gSharedObjectHaikuVersion\|llvm_.*'
-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.23.0
2.24.0
From b66d806367c081d9871bb2cb0e473449fe6cb648 Mon Sep 17 00:00:00 2001
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 ce0bdab..ccfb420 100755
index a7b4c49..d39fa2c 100755
--- a/src/check-libstdc++.sh
+++ b/src/check-libstdc++.sh
@@ -10,10 +10,15 @@ stat=0
@@ -50,7 +50,7 @@ index ce0bdab..ccfb420 100755
else
echo "check-libstdc++.sh: 'ldd' not found; skipping test"
exit 77
@@ -29,7 +34,7 @@ for soname in harfbuzz harfbuzz-gobject; do
@@ -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"
@@ -60,5 +60,5 @@ index ce0bdab..ccfb420 100755
stat=1
fi
--
2.23.0
2.24.0