From d5f449180a5a64341c90ed2a3f471206034cbc6d Mon Sep 17 00:00:00 2001
From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:25:49 -0700
Subject: [PATCH] Update Windows ARM64 workflow dependencies and paths

---
 .github/workflows/windows-arm64-msys2.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows-arm64-msys2.yml b/.github/workflows/windows-arm64-msys2.yml
index 92870aed..2c8ae6a2 100644
--- a/.github/workflows/windows-arm64-msys2.yml
+++ b/.github/workflows/windows-arm64-msys2.yml
@@ -22,12 +22,14 @@ jobs:
           update: true
           install: >-
             git
-            gettext
-            libxml2
+            bsdtar
             mingw-w64-clang-aarch64-toolchain
             mingw-w64-clang-aarch64-meson
             mingw-w64-clang-aarch64-ninja
             mingw-w64-clang-aarch64-pkgconf
+            mingw-w64-clang-aarch64-gettext-tools
+            mingw-w64-clang-aarch64-libxml2
+            mingw-w64-clang-aarch64-winpthreads
             mingw-w64-clang-aarch64-python-cffi
             mingw-w64-clang-aarch64-gtk2
             mingw-w64-clang-aarch64-gtk-update-icon-cache
@@ -37,29 +39,39 @@ jobs:
       - name: Configure
         run: |
           set -euxo pipefail
+          export PATH="/clangarm64/bin:$PATH"
+
+          # Sanity: ensure we're using the CLANGARM64 msgfmt (with ITS data)
+          which msgfmt
+          msgfmt --version
+
           rm -rf build package
           meson setup build \
             -Dtext-frontend=true \
             -Ddbus=disabled \
             -Dwith-upd=false \
-            -Dwith-perl=false
+            -Dwith-perl=false \
+            -Dc_link_args=-lwinpthread \
+            -Dcxx_link_args=-lwinpthread
 
       - name: Build
         run: |
           set -euxo pipefail
+          export PATH="/clangarm64/bin:$PATH"
           ninja -C build
 
       - name: Test
         run: |
           set -euxo pipefail
+          export PATH="/clangarm64/bin:$PATH"
           ninja -C build test
 
       - name: Stage install (portable zip)
         run: |
           set -euxo pipefail
+          export PATH="/clangarm64/bin:$PATH"
           DESTDIR="$PWD/package" ninja -C build install
           cd package
-          # bsdtar exists on GitHub runners; makes a normal zip
           bsdtar -acf ../zoitechat-windows-arm64.zip .
           cd ..