From 5fd1be30f67387a1a1658db28bd5b8223d7ed162 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 9 Oct 2022 12:32:56 +0300
Subject: [PATCH 24/24] flatpak: Add Qt-client flatpak

See osdn #45814

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

diff --git a/Makefile.am b/Makefile.am
index b7cd4d1349..de886f933b 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.qt.yml	\
 		scripts/mapimg2anim		\
 		scripts/setup_auth_server.sh	\
 		scripts/diff_ignore		\
diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh
index ea9cbfaba1..8266a0b190 100755
--- a/flatpak/build_flatpak.sh
+++ b/flatpak/build_flatpak.sh
@@ -4,9 +4,11 @@ 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.qt.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-gtk3-${FCVER}.flatpak" org.freeciv.mp.gtk3 ||
+   ! flatpak build-bundle repo "freeciv-qt-${FCVER}.flatpak" org.freeciv.qt
 then
   echo "FAILURE" >&2
   exit 1
diff --git a/flatpak/org.freeciv.qt.yml b/flatpak/org.freeciv.qt.yml
new file mode 100644
index 0000000000..fc64db064a
--- /dev/null
+++ b/flatpak/org.freeciv.qt.yml
@@ -0,0 +1,23 @@
+app-id: org.freeciv.qt
+runtime: org.kde.Platform
+runtime-version: '5.15-22.08'
+sdk: org.kde.Sdk
+command: freeciv-qt
+rename-icon: freeciv-client
+modules:
+  - name: freeciv-qt
+    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-client=qt --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
+    sources:
+      - type: dir
+        path: ..
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
-- 
2.35.1