From 4cf31d977f140310b498059648a7f0f87a9c6032 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 29 Oct 2023 06:43:54 +0200
Subject: [PATCH 27/27] Flatpak: Build gtk4x-client

See osdn #48914

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 platforms/Makefile.am                   |  1 +
 platforms/flatpak/build_flatpak.sh      |  2 ++
 platforms/flatpak/org.freeciv.gtk4x.yml | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 platforms/flatpak/org.freeciv.gtk4x.yml

diff --git a/platforms/Makefile.am b/platforms/Makefile.am
index d7902f3f1b..8342c429c8 100644
--- a/platforms/Makefile.am
+++ b/platforms/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST =						\
 		flatpak/build_flatpak.sh		\
 		flatpak/org.freeciv.gtk322.yml		\
 		flatpak/org.freeciv.gtk4.yml		\
+		flatpak/org.freeciv.gtk4x.yml		\
 		flatpak/org.freeciv.gtk3.mp.yml		\
 		flatpak/org.freeciv.gtk4.mp.yml		\
 		flatpak/org.freeciv.qt.yml		\
diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh
index aa1600f6f7..5215c6973f 100755
--- a/platforms/flatpak/build_flatpak.sh
+++ b/platforms/flatpak/build_flatpak.sh
@@ -24,6 +24,7 @@ FCVER=$(../../fc_version)
 
 if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4.yml ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk322.yml ||
+   ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4x.yml ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4.mp.yml ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4x.mp.yml ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk3.mp.yml ||
@@ -34,6 +35,7 @@ if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state"
    ! flatpak build-update-repo "${BROOT}/repo" ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4-${FCVER}.flatpak" org.freeciv.gtk4 ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk3.22-${FCVER}.flatpak" org.freeciv.gtk322 ||
+   ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4x-${FCVER}.flatpak" org.freeciv.gtk4x ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4-mp-${FCVER}.flatpak" org.freeciv.gtk4.mp ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4x-mp-${FCVER}.flatpak" org.freeciv.gtk4x.mp ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk3-mp-${FCVER}.flatpak" org.freeciv.gtk3.mp ||
diff --git a/platforms/flatpak/org.freeciv.gtk4x.yml b/platforms/flatpak/org.freeciv.gtk4x.yml
new file mode 100644
index 0000000000..bd5dd2d421
--- /dev/null
+++ b/platforms/flatpak/org.freeciv.gtk4x.yml
@@ -0,0 +1,24 @@
+app-id: org.freeciv.gtk4x
+runtime: org.gnome.Platform
+runtime-version: '45'
+sdk: org.gnome.Sdk
+command: freeciv-gtk4x
+rename-icon: freeciv-client
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
+modules:
+  - name: freeciv-gtk4x
+    buildsystem: meson
+    no-autogen: true
+    config-opts:
+      - -Dclients=gtk4x
+      - -Dfcmp=[]
+      - -Dtools=[]
+    sources:
+      - type: dir
+        path: ../..
-- 
2.42.0