From b46ff8a8c38fa33c51888f25e547063b2fd3d473 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 18 Oct 2023 03:07:40 +0300
Subject: [PATCH 31/31] Flatpak: Add gtk4x Modpack Installer flatpak

See osdn #48863

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

diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh
index 3bcd12f040..aa1600f6f7 100755
--- a/platforms/flatpak/build_flatpak.sh
+++ b/platforms/flatpak/build_flatpak.sh
@@ -25,6 +25,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.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 ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.qt.yml ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.sdl2.yml ||
@@ -34,6 +35,7 @@ if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state"
    ! 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-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 ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-qt-${FCVER}.flatpak" org.freeciv.qt ||
    ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-sdl2-${FCVER}.flatpak" org.freeciv.sdl2 ||
diff --git a/platforms/flatpak/org.freeciv.gtk4x.mp.yml b/platforms/flatpak/org.freeciv.gtk4x.mp.yml
new file mode 100644
index 0000000000..89098fe581
--- /dev/null
+++ b/platforms/flatpak/org.freeciv.gtk4x.mp.yml
@@ -0,0 +1,24 @@
+app-id: org.freeciv.gtk4x.mp
+runtime: org.gnome.Platform
+runtime-version: '45'
+sdk: org.gnome.Sdk
+command: freeciv-mp-gtk4x
+rename-icon: freeciv-modpack
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --filesystem=~/.freeciv:create
+modules:
+  - name: freeciv-mp-gtk4x
+    buildsystem: meson
+    no-autogen: true
+    config-opts:
+      - -Dfcmp=gtk4x
+      - -Dclients=[]
+      - -Dserver=disabled
+      - -Dtools=[]
+    sources:
+      - type: dir
+        path: ../..
-- 
2.42.0