From c5c153ec680687c94cd5b162e4a2792811dec302 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 19 Jun 2022 09:19:33 +0300
Subject: [PATCH 30/30] CI: Build gtk4-client & modpack installer

See osdn #44725

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml |  3 +++
 scripts/ci-build.sh      | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b2a24deaf..8f43f996c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,6 +89,7 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
             gettext \
             libgtk-3-dev \
+            libgtk-4-dev \
             libcurl4-openssl-dev \
             libtool \
             automake \
@@ -152,6 +153,7 @@ jobs:
             libtolua-dev \
             gettext \
             libgtk-3-dev \
+            libgtk-4-dev \
             libcurl4-openssl-dev \
             libtool \
             automake \
@@ -185,6 +187,7 @@ jobs:
             liblua5.4-dev \
             gettext \
             libgtk-3-dev \
+            libgtk-4-dev \
             libcurl4-openssl-dev \
             libtool \
             automake \
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index ec0e445225..552fa32f32 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -42,7 +42,7 @@ fi
 
 mkdir build
 cd build
-meson .. -Dprefix=${HOME}/freeciv/meson -Ddebug=true -Dack_experimental=true -Dclients='gtk3.22','qt','sdl2' -Dfcmp='gtk3','qt','cli' -Dqtver=qt5
+meson .. -Dprefix=${HOME}/freeciv/meson -Ddebug=true -Dack_experimental=true -Dclients='gtk3.22','qt','sdl2','gtk4' -Dfcmp='gtk3','qt','cli','gtk4' -Dqtver=qt5
 ninja
 ninja install
 ;;
@@ -87,8 +87,8 @@ cd build
  --enable-sys-tolua-cmd \
  --disable-fcdb \
  --with-qtver=qt6 \
- --enable-client=gtk3.22,gtk3,qt,sdl2,stub \
- --enable-fcmp=cli,gtk3,qt \
+ --enable-client=gtk3.22,gtk3,qt,sdl2,gtk4,stub \
+ --enable-fcmp=cli,gtk3,qt,gtk4 \
  --enable-freeciv-manual \
  --enable-ai-static=classic,threaded,tex,stub \
  --prefix=${HOME}/freeciv/clang \
@@ -111,8 +111,8 @@ cd build
  CFLAGS="-O3" \
  CXXFLAGS="-O3" \
  --with-qtver=qt6 \
- --enable-client=gtk3.22,gtk3,qt,sdl2,stub \
- --enable-fcmp=cli,gtk3,qt \
+ --enable-client=gtk3.22,gtk3,qt,sdl2,gtk4,stub \
+ --enable-fcmp=cli,gtk3,qt,gtk4 \
  --enable-freeciv-manual \
  --enable-ruledit=experimental \
  --enable-ai-static=classic,threaded,tex,stub \
-- 
2.35.1