From 1305c4f8c5cd4b74f2f6e983156ab167e2ec5a5c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 24 Mar 2026 21:35:36 -0400
Subject: [PATCH] BLD: Update bundled libraqm to 0.10.4

This incorporates our patch, so we can drop it, and adds `tests` option,
which we now disable.
---
 extern/meson.build                         |  5 ++--
 subprojects/libraqm-0.10.3.wrap            |  8 -------
 subprojects/libraqm-0.10.4.wrap            |  7 ++++++
 subprojects/packagefiles/libraqm-203.patch | 27 ----------------------
 4 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 subprojects/libraqm-0.10.3.wrap
 create mode 100644 subprojects/libraqm-0.10.4.wrap
 delete mode 100644 subprojects/packagefiles/libraqm-203.patch

diff --git a/extern/meson.build b/extern/meson.build
index d2b5f0427573..df6557a8e699 100644
--- a/extern/meson.build
+++ b/extern/meson.build
@@ -25,7 +25,7 @@ else
 endif
 
 if get_option('system-libraqm')
-  libraqm_dep = dependency('raqm', version: '>=0.10.3')
+  libraqm_dep = dependency('raqm', version: '>=0.10.4')
 else
   subproject('harfbuzz',
     default_options: [
@@ -52,10 +52,11 @@ else
     ]
   )
   subproject('sheenbidi', default_options: ['default_library=static'])
-  libraqm_proj = subproject('libraqm-0.10.3',
+  libraqm_proj = subproject('libraqm-0.10.4',
     default_options: [
       'default_library=static',
       'sheenbidi=true',
+      'tests=false',
     ]
   )
   libraqm_dep = libraqm_proj.get_variable('libraqm_dep')
diff --git a/subprojects/libraqm-0.10.3.wrap b/subprojects/libraqm-0.10.3.wrap
deleted file mode 100644
index 87061a231cba..000000000000
--- a/subprojects/libraqm-0.10.3.wrap
+++ /dev/null
@@ -1,8 +0,0 @@
-[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
diff --git a/subprojects/libraqm-0.10.4.wrap b/subprojects/libraqm-0.10.4.wrap
new file mode 100644
index 000000000000..5fad16334895
--- /dev/null
+++ b/subprojects/libraqm-0.10.4.wrap
@@ -0,0 +1,7 @@
+[wrap-file]
+source_url = https://github.com/HOST-Oman/libraqm/archive/v0.10.4/libraqm-0.10.4.tar.gz
+source_filename = libraqm-0.10.4.tar.gz
+source_hash = 6b583fb0eb159a3727a1e8c653bb0294173a14af8eb60195a775879de72320a3
+
+# First patch allows using our bundled FreeType.
+diff_files = libraqm-0.10.2-bundle-freetype.patch
diff --git a/subprojects/packagefiles/libraqm-203.patch b/subprojects/packagefiles/libraqm-203.patch
deleted file mode 100644
index 6628fec1d111..000000000000
--- a/subprojects/packagefiles/libraqm-203.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8cedfc989998bb2cf23c2c1b40802effad72b0ed Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-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',