From 2b4200d3f2c4755c37741b22fc78f5d010abeb71 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:28:32 +0000
Subject: [PATCH] [fontconfig] Enable WebAssembly atomics and bulk-memory
 (#41238)

---
 .../fix-wasm-shared-memory-atomics.patch           | 14 ++++++++++++++
 ports/fontconfig/portfile.cmake                    |  1 +
 ports/fontconfig/vcpkg.json                        |  1 +
 versions/baseline.json                             |  2 +-
 versions/f-/fontconfig.json                        |  5 +++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 ports/fontconfig/fix-wasm-shared-memory-atomics.patch

diff --git a/ports/fontconfig/fix-wasm-shared-memory-atomics.patch b/ports/fontconfig/fix-wasm-shared-memory-atomics.patch
new file mode 100644
index 0000000000..d94d109c80
--- /dev/null
+++ b/ports/fontconfig/fix-wasm-shared-memory-atomics.patch
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index 8e78700..95bae59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -112,6 +112,9 @@ check_alignofs = [
+ ]
+ 
+ add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
++if cc.get_id() == 'clang' and host_machine.cpu_family() == 'wasm'
++    add_project_arguments('-matomics', '-mbulk-memory', language: 'c')
++endif
+ 
+ c_args = []
+ 
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index 73875a5db9..9cf2635b8f 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_gitlab(
     PATCHES
         no-etc-symlinks.patch
         libgetopt.patch
+        fix-wasm-shared-memory-atomics.patch
 )
 
 vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json
index 8123069626..81d0ad316c 100644
--- a/ports/fontconfig/vcpkg.json
+++ b/ports/fontconfig/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fontconfig",
   "version": "2.15.0",
+  "port-version": 1,
   "description": "Library for configuring and customizing font access.",
   "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index b29b948626..031717bc38 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2858,7 +2858,7 @@
     },
     "fontconfig": {
       "baseline": "2.15.0",
-      "port-version": 0
+      "port-version": 1
     },
     "foonathan-lexy": {
       "baseline": "2022.12.1",
diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json
index 22be7c20f8..4a082f4689 100644
--- a/versions/f-/fontconfig.json
+++ b/versions/f-/fontconfig.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "443f2cc8005cd715e8786521c1c2cd990a1320a8",
+      "version": "2.15.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2a11e54fe49673d52f0c4d2df73870f36a228990",
       "version": "2.15.0",