From 97370a399b789369fd2eee43ea4da3067ea6ae1b Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 25 May 2025 09:18:56 +0200
Subject: [PATCH 1/2] Add ntldd to msys2installdeps.sh

---
 buildtools/msys2installdeps.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh
index 62e6a2de6d..e24a8af2f5 100644
--- a/buildtools/msys2installdeps.sh
+++ b/buildtools/msys2installdeps.sh
@@ -73,7 +73,8 @@ $ARCH-gtkmm4
 # install packaging tools (required for dist-win-* targets)
 eval pacman -S $PACMAN_OPTIONS \
 $ARCH-7zip \
-$ARCH-nsis
+$ARCH-nsis \
+$ARCH-ntldd
 
 # install Inkscape dependencies (optional)
 eval pacman -S $PACMAN_OPTIONS \
-- 
GitLab


From 4975e16d4a12264edac3fc100fb0d1b433627fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= <dehesselle@web.de>
Date: Sun, 25 May 2025 14:28:09 +0200
Subject: [PATCH 2/2] Update Windows dependencies to r115

Reduce ccache size to 500M.
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c2c7fa113..85d5c8529f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,14 +188,14 @@ inkscape:macos:
   variables:
     MSYSTEM: UCRT64
     CCACHE_DIR: $CI_PROJECT_DIR/ccache
-    CCACHE_MAXSIZE: "1.0G"
+    CCACHE_MAXSIZE: "500M"
     # IDW = Inkscape Deps Windows, https://gitlab.com/inkscape/deps/windows
-    IDW_VERSION: 69
+    IDW_VERSION: 115
     IDW_NAME: ink$IDW_VERSION
-    IDW_RELEASE_URL: $CI_API_V4_URL/projects/46863172/packages/generic/windows/r$IDW_VERSION/$IDW_NAME.7z
+    IDW_RELEASE_URL: $CI_API_V4_URL/projects/46863172/packages/generic/windows/r$IDW_VERSION/${IDW_NAME}_$MSYSTEM.7z
   before_script:
     - wget.exe --quiet --no-check-certificate $IDW_RELEASE_URL
-    - 7z x -oC:/ "$Env:IDW_NAME.7z"
+    - 7z x -oC:/ "${Env:IDW_NAME}_${Env:MSYSTEM}.7z"
 
 
 inkscape:windows:
-- 
GitLab