diff --git a/media-libs/harfbuzz/harfbuzz-1.4.7.recipe b/media-libs/harfbuzz/harfbuzz-1.4.8.recipe similarity index 89% rename from media-libs/harfbuzz/harfbuzz-1.4.7.recipe rename to media-libs/harfbuzz/harfbuzz-1.4.8.recipe index cc59d8125..f4598c5c6 100644 --- a/media-libs/harfbuzz/harfbuzz-1.4.7.recipe +++ b/media-libs/harfbuzz/harfbuzz-1.4.8.recipe @@ -18,7 +18,7 @@ COPYRIGHT="2004-2017 Behdad Esfahbod LICENSE="MIT" REVISION="1" SOURCE_URI="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2" -CHECKSUM_SHA256="b85f6627425d54f32118308e053b939c63a388de9bf455b3830f68cad406bc6d" +CHECKSUM_SHA256="ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131" PATCHES="harfbuzz-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -34,8 +34,8 @@ fi PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - lib:libharfbuzz$secondaryArchSuffix = 0.10400.7 compat >= 0 - lib:libharfbuzz_icu$secondaryArchSuffix = 0.10400.7 compat >= 0 + lib:libharfbuzz$secondaryArchSuffix = 0.10400.8 compat >= 0 + lib:libharfbuzz_icu$secondaryArchSuffix = 0.10400.8 compat >= 0 cmd:hb_ot_shape_closure$commandSuffix cmd:hb_shape$commandSuffix " @@ -54,8 +54,8 @@ REQUIRES=" PROVIDES_devel=" harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 - devel:libharfbuzz$secondaryArchSuffix = 0.10400.7 compat >= 0 - devel:libharfbuzz_icu$secondaryArchSuffix = 0.10400.7 compat >= 0 + devel:libharfbuzz$secondaryArchSuffix = 0.10400. compat >= 0 + devel:libharfbuzz_icu$secondaryArchSuffix = 0.10400.8 compat >= 0 " REQUIRES_devel=" harfbuzz$secondaryArchSuffix == $portVersion base diff --git a/media-libs/harfbuzz/patches/harfbuzz-1.4.7.patchset b/media-libs/harfbuzz/patches/harfbuzz-1.4.8.patchset similarity index 59% rename from media-libs/harfbuzz/patches/harfbuzz-1.4.7.patchset rename to media-libs/harfbuzz/patches/harfbuzz-1.4.8.patchset index 11d22e35f..50a0dd0d5 100644 --- a/media-libs/harfbuzz/patches/harfbuzz-1.4.7.patchset +++ b/media-libs/harfbuzz/patches/harfbuzz-1.4.8.patchset @@ -1,4 +1,4 @@ -From 8a356acde10854278b098ca2db391506bd91ead6 Mon Sep 17 00:00:00 2001 +From a8cf9112a315902e3cfb2f3ba796ad6a048d9a79 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 19 Jun 2016 14:41:51 +0000 Subject: Fix scripts in the test suite to better filter the output of nm. @@ -9,28 +9,28 @@ these scripts that they should ignore two symbols that are Haiku-specific: _gSharedObjectHaikuABI and _gSharedObjectHaikuVersion. diff --git a/src/check-defs.sh b/src/check-defs.sh -index 65a2467..f4b2cd4 100755 +index 480d499..8a0d395 100755 --- a/src/check-defs.sh +++ b/src/check-defs.sh @@ -21,7 +21,7 @@ for def in $defs; do lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'` so=.libs/lib${lib}.so -- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" -+ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| _gSharedObjectHaikuABI\>\| _gSharedObjectHaikuVersion\>\| llvm_' | cut -d' ' -f3`" +- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] .' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" ++ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] .' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| _gSharedObjectHaikuABI\>\| _gSharedObjectHaikuVersion\>\| llvm_' | cut -d' ' -f3`" if test -f "$so"; then diff --git a/src/check-symbols.sh b/src/check-symbols.sh -index ba09ba1..4c62102 100755 +index d4d655d..ac449dc 100755 --- a/src/check-symbols.sh +++ b/src/check-symbols.sh @@ -20,7 +20,7 @@ for suffix in so dylib; do so=.libs/libharfbuzz.$suffix if ! test -f "$so"; then continue; fi -- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| ___gcov_flush\>\| llvm_\| _llvm_' | cut -d' ' -f3`" -+ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| ___gcov_flush\>\| _gSharedObjectHaikuABI\>\| _gSharedObjectHaikuVersion\>\| llvm_\| _llvm_' | cut -d' ' -f3`" +- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] .' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| ___gcov_flush\>\| llvm_\| _llvm_' | cut -d' ' -f3`" ++ EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] .' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| ___gcov_flush\>\| _gSharedObjectHaikuABI\>\| _gSharedObjectHaikuVersion\>\| llvm_\| _llvm_' | cut -d' ' -f3`" prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`