From e0ce66636815dad5570d3a515981e22f1dd5e116 Mon Sep 17 00:00:00 2001
From: Max Gaukler <development@maxgaukler.de>
Date: Sun, 31 Mar 2024 20:36:25 +0200
Subject: [PATCH] Fix Windows build for Gtk4

Due to the migration to Gtk4, the build on Windows no longer worked.

- /etc/gtk-4.0 no longer exists, make the install step ignore this
- add missing dependency `enchant` that is expected by the install step
- Remove unneeded dependency `Atk`

Fixes https://gitlab.com/inkscape/inbox/-/issues/10167
---
 CMakeScripts/InstallMSYS2.cmake | 6 ++----
 buildtools/msys2installdeps.sh  | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 23f0c4dad5..7f198a39e7 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -14,8 +14,6 @@ if(WIN32)
     ${MINGW_BIN}/libLerc.dll
     ${MINGW_BIN}/libaom.dll
     ${MINGW_BIN}/libaspell-[0-9]*.dll
-    ${MINGW_BIN}/libatk-1.0-[0-9]*.dll
-    ${MINGW_BIN}/libatkmm-1.6-[0-9]*.dll
     ${MINGW_BIN}/libboost_filesystem-mt.dll
     ${MINGW_BIN}/libbrotlicommon.dll
     ${MINGW_BIN}/libbrotlidec.dll
@@ -235,7 +233,8 @@ if(WIN32)
     PATTERN "*.cache")
 
   install(DIRECTORY ${MINGW_PATH}/etc/gtk-4.0
-    DESTINATION etc)
+    DESTINATION etc
+    OPTIONAL)
 
   install(DIRECTORY ${MINGW_LIB}/gdk-pixbuf-2.0
     DESTINATION lib
@@ -246,7 +245,6 @@ if(WIN32)
   # Typelibs for gtk, pango, cairo -> can be used in Python extensions
   # ToDo: Automate the creation of this collection!
   install (FILES
-    ${MINGW_LIB}/girepository-1.0/Atk-1.0.typelib
     ${MINGW_LIB}/girepository-1.0/cairo-1.0.typelib
     ${MINGW_LIB}/girepository-1.0/GdkPixbuf-2.0.typelib
     ${MINGW_LIB}/girepository-1.0/Gio-2.0.typelib
diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh
index adba9c50d3..d37b06bde4 100644
--- a/buildtools/msys2installdeps.sh
+++ b/buildtools/msys2installdeps.sh
@@ -80,7 +80,8 @@ $ARCH-aspell \
 $ARCH-aspell-en \
 $ARCH-gtksourceview5 \
 $ARCH-graphicsmagick \
-$ARCH-libjxl
+$ARCH-libjxl \
+$ARCH-enchant
 
 # install Python and modules used by Inkscape
 eval pacman -S $PACMAN_OPTIONS \
@@ -134,5 +135,4 @@ for arch in $(eval echo $ARCH); do
   esac
 done
 
-
 echo "Done :-)"
-- 
GitLab