From 657882a2b942108d6d8a2320b62c330f76bdfd09 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 1 Sep 2019 19:19:51 +0300
Subject: [PATCH] harfbuzz: bump version

---
 ...harfbuzz-2.3.1.recipe => harfbuzz-2.6.1.recipe} |  6 +++---
 ...buzz-2.3.1.patchset => harfbuzz-2.6.1.patchset} | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename media-libs/harfbuzz/{harfbuzz-2.3.1.recipe => harfbuzz-2.6.1.recipe} (96%)
 rename media-libs/harfbuzz/patches/{harfbuzz-2.3.1.patchset => harfbuzz-2.6.1.patchset} (87%)

diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.recipe b/media-libs/harfbuzz/harfbuzz-2.6.1.recipe
similarity index 96%
rename from media-libs/harfbuzz/harfbuzz-2.3.1.recipe
rename to media-libs/harfbuzz/harfbuzz-2.6.1.recipe
index 395f0c2e1..ff6f768d4 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.recipe
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.recipe
@@ -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.bz2"
-CHECKSUM_SHA256="f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"
+SOURCE_URI="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.xz"
+CHECKSUM_SHA256="c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f"
 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.20301.0"
+libVersion="0.20600.1"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
diff --git a/media-libs/harfbuzz/patches/harfbuzz-2.3.1.patchset b/media-libs/harfbuzz/patches/harfbuzz-2.6.1.patchset
similarity index 87%
rename from media-libs/harfbuzz/patches/harfbuzz-2.3.1.patchset
rename to media-libs/harfbuzz/patches/harfbuzz-2.6.1.patchset
index 682f844d6..44e6914fa 100644
--- a/media-libs/harfbuzz/patches/harfbuzz-2.3.1.patchset
+++ b/media-libs/harfbuzz/patches/harfbuzz-2.6.1.patchset
@@ -1,4 +1,4 @@
-From cd059ecb349a848e670418a347c5f7c51e041ba4 Mon Sep 17 00:00:00 2001
+From d3a5ade5608793eb40bd472c5968d6300fc6323b 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,23 +8,23 @@ 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 cea8684..538291e 100755
+index f181b63..fd96f44 100755
 --- a/src/check-symbols.sh
 +++ b/src/check-symbols.sh
 @@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
  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_flush\|llvm_.*'
-+IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_flush\|_gSharedObjectHaikuABI\|_gSharedObjectHaikuVersion\|llvm_.*'
+-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_.*'
  
  if which nm 2>/dev/null >/dev/null; then
  	:
 -- 
-2.17.1
+2.23.0
 
 
-From dd78e507d3f667f7aa2027fe719bb11735882e4f Mon Sep 17 00:00:00 2001
+From b66d806367c081d9871bb2cb0e473449fe6cb648 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.
@@ -60,5 +60,5 @@ index ce0bdab..ccfb420 100755
  			stat=1
  		fi
 -- 
-2.17.1
+2.23.0