BLD: Update text shaping libraries to latest versions

Author: QuLogic

extern/meson.build

@@ -31,25 +31,31 @@ else
 endif
 
 if get_option('system-libraqm')
-  libraqm_dep = dependency('raqm', version: '>=0.10.2')
+  libraqm_dep = dependency('raqm', version: '>=0.10.3')
 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.3',
+    default_options: [
+      'default_library=static',
+      'sheenbidi=true',
+    ]
+  )
   libraqm_dep = libraqm_proj.get_variable('libraqm_dep')
 endif
 

subprojects/harfbuzz.wrap

@@ -1,8 +1,13 @@
 [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

@@ -0,0 +1,8 @@
+[wrap-file]
+source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.3/libraqm-0.10.3.tar.gz
+source_filename = libraqm-0.10.3.tar.gz
+source_hash = fe1fe28b32f97ef97b325ca5d2defb0704da1ef048372ec20e85e1f587e20965
+
+# First patch allows using our bundled FreeType.
+# Second patch is for use as a subproject https://github.com/HOST-Oman/libraqm/pull/203
+diff_files = libraqm-0.10.2-bundle-freetype.patch, libraqm-203.patch

subprojects/libraqm-0.10.3.wrap

@@ -9,17 +9,3 @@
          fallback: ['freetype2', 'freetype_dep'],
          default_options: [
              'png=disabled',
---- a/src/meson.build	2025-03-26 03:59:08.651929905 -0400
-+++ b/src/meson.build	2025-03-26 04:00:09.537615893 -0400
-@@ -42,6 +42,11 @@
-     install: true,
- )
- 
-+libraqm_dep = declare_dependency(
-+    include_directories: include_directories('.'),
-+    link_with: libraqm,
-+)
-+
- libraqm_test = static_library(
-     'raqm-test',
-     'raqm.c',

subprojects/packagefiles/libraqm-0.10.2-bundle-freetype.patch

@@ -0,0 +1,27 @@
+From 8cedfc989998bb2cf23c2c1b40802effad72b0ed Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <[email protected]>
+Date: Thu, 7 Aug 2025 18:07:15 -0400
+Subject: [PATCH] Add dependency override for use as a subproject
+
+---
+ src/meson.build | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index 0a32f832..ca7c13d1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,13 @@ libraqm = library(
+     install: true,
+ )
+ 
++libraqm_dep = declare_dependency(
++    include_directories: include_directories('.'),
++    link_with: libraqm,
++)
++
++meson.override_dependency(meson.project_name(), libraqm_dep)
++
+ libraqm_test = static_library(
+     'raqm-test',
+     'raqm.c',

subprojects/packagefiles/libraqm-203.patch

@@ -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