Update harfbuzz to 11.2.1 (#11716)

This commit is contained in:
linkmauve
2025-07-04 10:32:27 +02:00
committed by GitHub
parent a20a74f4b3
commit 9c4a5ee8f9
3 changed files with 53 additions and 46 deletions

View File

@@ -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="109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847"
CHECKSUM_SHA256="093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49"
PATCHES="harfbuzz-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -31,7 +31,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi
libVersion="0.60830.0"
libVersion="0.61121.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -108,7 +108,7 @@ defineDebugInfoPackage harfbuzz$secondaryArchSuffix \
BUILD()
{
meson \
--buildtype=release \
--buildtype=debug \
--prefix=$prefix \
--libdir=$libDir \
--includedir=$includeDir \

View File

@@ -0,0 +1,49 @@
From 6f47a6806da08288501ba6e07a302da38a127c0e 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 script after Python migration
diff --git a/src/check-symbols.py b/src/check-symbols.py
index 8de58b8..7d68ce8 100755
--- a/src/check-symbols.py
+++ b/src/check-symbols.py
@@ -33,6 +33,8 @@ IGNORED_SYMBOLS = [
"mangle_path",
"lprofDirMode",
"reset_fn_list",
+ '_gSharedObjectHaikuABI',
+ '_gSharedObjectHaikuVersion',
]
# Rust
--
2.48.1
From dc7f8fb7b042c5fb39138e22d4302135e9c1be82 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Mon, 30 Jun 2025 18:54:44 +0200
Subject: #undef HAVE_SINCOSF
Fixes: error: 'sincosf' was not declared in this scope
sincosf is defined in math.h, but undefined in the system
diff --git a/src/hb-geometry.hh b/src/hb-geometry.hh
index c22a26a..0222a6a 100644
--- a/src/hb-geometry.hh
+++ b/src/hb-geometry.hh
@@ -27,6 +27,10 @@
#include "hb.hh"
+#ifdef __HAIKU__
+#undef HAVE_SINCOSF
+#endif
+
struct hb_extents_t
{
hb_extents_t () {}
--
2.48.1

View File

@@ -1,42 +0,0 @@
From 441971c5b1facefc74803df60381056abcbeaa56 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 script after Python migration
diff --git a/src/check-symbols.py b/src/check-symbols.py
index 91bf8b0..c2e0511 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.42.1
From 8396337bad9db01781081b739654941801c08c06 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 11 Oct 2023 10:45:36 +0200
Subject: Disable tests, ERROR: Unknown variable "hb_shape"
diff --git a/test/meson.build b/test/meson.build
index 371b7ef..bc2085a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,5 +1,3 @@
subdir('api')
-subdir('shape')
-subdir('subset')
subdir('fuzzing')
subdir('threads')
--
2.42.1