From c857beb57abd432db6b1a473296858bdf41b0f3e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 24 Oct 2023 06:44:05 +0300
Subject: [PATCH 34/34] installer_cross: Add gtk4x-client build

See osdn #48899

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 platforms/windows/Makefile.am                          |  2 ++
 platforms/windows/installer_cross/freeciv-gtk4x.cmd    |  3 +++
 platforms/windows/installer_cross/freeciv-mp-gtk4x.cmd |  3 +++
 .../installer_cross/meson-build_all_installers.sh      | 10 ++++++++++
 .../windows/installer_cross/meson-installer_build.sh   |  8 ++++++--
 platforms/windows/installer_cross/meson-winbuild.sh    |  2 ++
 6 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100755 platforms/windows/installer_cross/freeciv-gtk4x.cmd
 create mode 100755 platforms/windows/installer_cross/freeciv-mp-gtk4x.cmd

diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am
index 835ec5eb4f..5834113608 100644
--- a/platforms/windows/Makefile.am
+++ b/platforms/windows/Makefile.am
@@ -34,8 +34,10 @@ dist_noinst_DATA = \
 		installer_cross/freeciv-server.cmd		\
 		installer_cross/freeciv-gtk3.22.cmd		\
 		installer_cross/freeciv-gtk4.cmd		\
+		installer_cross/freeciv-gtk4x.cmd		\
 		installer_cross/freeciv-mp-gtk3.cmd		\
 		installer_cross/freeciv-mp-gtk4.cmd		\
+		installer_cross/freeciv-mp-gtk4x.cmd		\
 		installer_cross/freeciv-qt.cmd			\
 		installer_cross/freeciv-mp-qt.cmd		\
 		installer_cross/freeciv-sdl2.cmd		\
diff --git a/platforms/windows/installer_cross/freeciv-gtk4x.cmd b/platforms/windows/installer_cross/freeciv-gtk4x.cmd
new file mode 100755
index 0000000000..d1fad55fa9
--- /dev/null
+++ b/platforms/windows/installer_cross/freeciv-gtk4x.cmd
@@ -0,0 +1,3 @@
+@echo off
+if not "%1" == "auto" set LANG=%1
+start "%~n0" /D . "%~dp0\freeciv-gtk4x.exe" %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/platforms/windows/installer_cross/freeciv-mp-gtk4x.cmd b/platforms/windows/installer_cross/freeciv-mp-gtk4x.cmd
new file mode 100755
index 0000000000..ce1aeee6a8
--- /dev/null
+++ b/platforms/windows/installer_cross/freeciv-mp-gtk4x.cmd
@@ -0,0 +1,3 @@
+@echo off
+if not "%1" == "auto" set LANG=%1
+start "%~n0" /D . "%~dp0\freeciv-mp-gtk4x.exe" %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/platforms/windows/installer_cross/meson-build_all_installers.sh b/platforms/windows/installer_cross/meson-build_all_installers.sh
index d9bb77a6e2..b6737163cc 100755
--- a/platforms/windows/installer_cross/meson-build_all_installers.sh
+++ b/platforms/windows/installer_cross/meson-build_all_installers.sh
@@ -72,6 +72,15 @@ else
   GTK4="Success"
 fi
 
+if test "${CROSSER_GTK4}" != "yes" ; then
+  GTK4x="N/A"
+elif ! ./meson-installer_build.sh "${DLLSPATH}" gtk4x ; then
+  RET=1
+  GTK4x="Fail"
+else
+  GTK4x="Success"
+fi
+
 if test "${CROSSER_QT6}" != "yes" ; then
   QT6="N/A"
 elif ! ./meson-installer_build.sh "${DLLSPATH}" qt6 ; then
@@ -111,6 +120,7 @@ fi
 
 echo "Gtk3.22: ${GTK322}"
 echo "Gtk4:    ${GTK4}"
+echo "Gtk4x:   ${GTK4x}"
 echo "Qt6:     ${QT6}"
 echo "Qt5:     ${QT5}"
 echo "Sdl2:    ${SDL2}"
diff --git a/platforms/windows/installer_cross/meson-installer_build.sh b/platforms/windows/installer_cross/meson-installer_build.sh
index 94f7068849..6c824f492b 100755
--- a/platforms/windows/installer_cross/meson-installer_build.sh
+++ b/platforms/windows/installer_cross/meson-installer_build.sh
@@ -123,6 +123,10 @@ case $GUI in
     GUINAME="GTK4"
     MPGUI="gtk4"
     FCMP="gtk4" ;;
+  gtk4x)
+    GUINAME="GTK4x"
+    MPGUI="gtk4x"
+    FCMP="gtk4x" ;;
   sdl2)
     GUINAME="SDL2"
     FCMP="gtk4" ;;
@@ -244,7 +248,7 @@ else
         exit 1
       fi
       ;;
-    gtk4)
+    gtk4|gtk4x)
       if ! add_gtk4_env "$DLLSPATH" "$INSTDIR" ; then
         echo "Copying gtk4 environment failed!" >&2
         exit 1
@@ -292,7 +296,7 @@ else
   fi
 
   if test "$GUI" = "gtk3.22" || test "$GUI" = "gtk4" ||
-     test "$GUI" = "sdl2" ; then
+     test "$GUI" = "gtk4x" || test "$GUI" = "sdl2" ; then
     UNINSTALLER="helpers/uninstaller-helper-gtk3.sh"
   else
     UNINSTALLER=""
diff --git a/platforms/windows/installer_cross/meson-winbuild.sh b/platforms/windows/installer_cross/meson-winbuild.sh
index 75b5f12957..0d31afa5e2 100755
--- a/platforms/windows/installer_cross/meson-winbuild.sh
+++ b/platforms/windows/installer_cross/meson-winbuild.sh
@@ -24,6 +24,7 @@ fi
 GUI="$2"
 
 if test "${GUI}" != "gtk3.22" && test "${GUI}" != "gtk4" &&
+   test "${GUI}" != "gtk4x" &&
    test "${GUI}" != "sdl2" &&
    test "${GUI}" != "qt5" && test "${GUI}" != "qt6" &&
    test "${GUI}" != "ruledit" ; then
@@ -79,6 +80,7 @@ TOOLS=manual,ruleup
 case "${GUI}" in
   gtk3.22) FCMP="gtk3" ;;
   gtk4) FCMP="gtk4" ;;
+  gtk4x) FCMP="gtk4x" ;;
   sdl2) FCMP="gtk4" ;;
   qt5) CLIENT="qt"
        FCMP="qt"
-- 
2.42.0