From 971f5c0340d142a926c6ea7e4890d363c04aa0b5 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 13 Feb 2023 01:12:50 +0200
Subject: [PATCH 15/15] flatpak: Add gtk4 modpack installer flatpak

See osdn #47286

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

diff --git a/Makefile.am b/Makefile.am
index 0a37a4ca27..bdcb6402e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,6 +75,7 @@ EXTRA_DIST =	autogen.sh 			\
 		flatpak/build_flatpak.sh	\
 		flatpak/org.freeciv.gtk322.yml	\
 		flatpak/org.freeciv.mp.gtk3.yml	\
+		flatpak/org.freeciv.mp.gtk4.yml	\
 		flatpak/org.freeciv.qt.yml	\
 		flatpak/org.freeciv.sdl2.yml	\
 		scripts/mapimg2anim		\
diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh
index 681abcb97d..239bae229e 100755
--- a/flatpak/build_flatpak.sh
+++ b/flatpak/build_flatpak.sh
@@ -15,11 +15,13 @@ FCVER=$(../fc_version)
 
 if ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.gtk322.yml ||
    ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.mp.gtk3.yml ||
+   ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.mp.gtk4.yml ||
    ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.qt.yml ||
    ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.sdl2.yml ||
    ! flatpak build-update-repo repo ||
    ! flatpak build-bundle repo "freeciv-gtk3.22-${FCVER}.flatpak" org.freeciv.gtk322 ||
    ! flatpak build-bundle repo "freeciv-mp-gtk3-${FCVER}.flatpak" org.freeciv.mp.gtk3 ||
+   ! flatpak build-bundle repo "freeciv-mp-gtk4-${FCVER}.flatpak" org.freeciv.mp.gtk4 ||
    ! flatpak build-bundle repo "freeciv-qt-${FCVER}.flatpak" org.freeciv.qt ||
    ! flatpak build-bundle repo "freeciv-sdl2-${FCVER}.flatpak" org.freeciv.sdl2
 then
diff --git a/flatpak/org.freeciv.mp.gtk4.yml b/flatpak/org.freeciv.mp.gtk4.yml
new file mode 100644
index 0000000000..ff8a2b4774
--- /dev/null
+++ b/flatpak/org.freeciv.mp.gtk4.yml
@@ -0,0 +1,24 @@
+app-id: org.freeciv.mp.gtk4
+runtime: org.gnome.Platform
+runtime-version: '42'
+sdk: org.gnome.Sdk
+command: freeciv-mp-gtk4
+rename-icon: freeciv-modpack
+modules:
+  - name: freeciv-mp-gtk4
+    buildsystem: simple
+    build-commands:
+      # On git clone, regenerate configure with autogen.sh
+      - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi
+      - mkdir build
+      - cd build && ../configure --prefix=/app --enable-fcmp=gtk4 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install
+    sources:
+      - type: dir
+        path: ..
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --device=dri
+  - --share=network
+  - --filesystem=~/.freeciv:create
-- 
2.39.1