BLD: Update harfbuzz and sheenbidi to latest version

Author: QuLogic

extern/meson.build

@@ -33,23 +33,29 @@ endif
 if get_option('system-libraqm')
   libraqm_dep = dependency('raqm', version: '>=0.10.2')
 else
-  LOCAL_LIBRAQM_VERSION = '0.10.2'
-
   subproject('harfbuzz',
     default_options: [
       'default_library=static',
+      'cairo=disabled',
+      'coretext=disabled',
+      'directwrite=disabled',
+      'fontations=disabled',
       'freetype=enabled',
+      'gdi=disabled',
       'glib=disabled',
       'gobject=disabled',
-      'cairo=disabled',
+      'harfruzz=disabled',
       'icu=disabled',
       'tests=disabled',
     ]
   )
   subproject('sheenbidi', default_options: ['default_library=static'])
-  libraqm_proj = subproject(
-    f'libraqm-@LOCAL_LIBRAQM_VERSION@',
-    default_options: ['default_library=static', 'sheenbidi=true'])
+  libraqm_proj = subproject('libraqm-0.10.2',
+    default_options: [
+      'default_library=static',
+      'sheenbidi=true',
+    ]
+  )
   libraqm_dep = libraqm_proj.get_variable('libraqm_dep')
 endif
 

subprojects/harfbuzz.wrap

@@ -1,8 +1,10 @@
 [wrap-file]
-directory = harfbuzz-11.2.0
-source_url = https://github.com/harfbuzz/harfbuzz/releases/download/11.2.0/harfbuzz-11.2.0.tar.xz
-source_filename = harfbuzz-11.2.0.tar.xz
-source_hash = 50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45
+directory = harfbuzz-11.2.1
+source_url = https://github.com/harfbuzz/harfbuzz/releases/download/11.2.1/harfbuzz-11.2.1.tar.xz
+source_filename = harfbuzz-11.2.1.tar.xz
+source_hash = 093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/harfbuzz_11.2.1-1/harfbuzz-11.2.1.tar.xz
+wrapdb_version = 11.2.1-1
 
-# This patch allows using our bundled FreeType.
-diff_files = harfbuzz-11.2.0-bundle-freetype.patch
+[provide]
+dependency_names = harfbuzz, harfbuzz-cairo, harfbuzz-gobject, harfbuzz-icu, harfbuzz-subset

subprojects/libraqm-0.10.2.wrap

@@ -3,8 +3,9 @@ source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.2/libraqm-0.10.2
 source_filename = libraqm-0.10.2.tar.gz
 source_hash = db68fd9f034fc40ece103e511ffdf941d69f5e935c48ded8a31590468e42ba72
 
-# This patch allows using our bundled FreeType.
-diff_files = libraqm-0.10.2-bundle-freetype.patch
+# First patch allows using our bundled FreeType.
+# Second patch is for latest SheenBidi.
+diff_files = libraqm-0.10.2-bundle-freetype.patch, libraqm-support-sheenbidi29.patch
 
 [provide]
 libraqm-0.10.2 = libraqm_dep

subprojects/packagefiles/libraqm-support-sheenbidi29.patch

@@ -0,0 +1,45 @@
+From 520164c36c94daabc20f49ed1e9f30bf0674d8a1 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <[email protected]>
+Date: Wed, 16 Jul 2025 01:06:00 -0400
+Subject: [PATCH] Add support for SheenBidi 2.9
+
+This release moved the main header from globally available to within a
+`SheenBidi` subdirectory.
+---
+ meson.build | 6 ++++++
+ src/raqm.c  | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index e4c8e93..34fffc7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -78,6 +78,12 @@ if get_option('sheenbidi')
+         'sheenbidi',
+         fallback: ['sheenbidi', 'sheenbidi_dep'],
+     )
++    if sheenbidi.version().version_compare('>= 2.9')
++        sheenbidi = declare_dependency(
++            compile_args: ['-DRAQM_SHEENBIDI_GT_2_9'],
++            dependencies: sheenbidi
++        )
++    endif
+ else
+     fribidi = dependency(
+         'fribidi',
+diff --git a/src/raqm.c b/src/raqm.c
+index fbeb172..2ded35b 100644
+--- a/src/raqm.c
++++ b/src/raqm.c
+@@ -30,7 +30,11 @@
+ #include <string.h>
+ 
+ #ifdef RAQM_SHEENBIDI
++#ifdef RAQM_SHEENBIDI_GT_2_9
++#include <SheenBidi/SheenBidi.h>
++#else
+ #include <SheenBidi.h>
++#endif
+ #else
+ #include <fribidi.h>
+ #endif

subprojects/sheenbidi.wrap

@@ -1,5 +1,5 @@
 [wrap-file]
-directory = SheenBidi-2.8
-source_url = https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.8/sheenbidi-2.8.tar.gz
-source_filename = sheenbidi-2.8.tar.gz
-source_hash = 6f27d5f347447f593bde573e4cb477925f7ed96afa4f936e7852803e1ddf3fea
+directory = SheenBidi-2.9.0
+source_url = https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.9.0/sheenbidi-2.9.0.tar.gz
+source_filename = sheenbidi-2.9.0.tar.gz
+source_hash = e90ae142c6fc8b94366f3526f84b349a2c10137f87093db402fe51f6eace6d13