From 3751528ef776cec9442167164a2d6b653f280440 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 7 Oct 2023 12:33:37 +0300
Subject: [PATCH 46/46] Flatpak: Add Qt Modpack Installer flatpak

See osdn #48812

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

diff --git a/Makefile.am b/Makefile.am
index 32b146a2fb..f784e1e32e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,6 +94,7 @@ EXTRA_DIST =	autogen.sh 			\
 		platforms/flatpak/org.freeciv.gtk3.mp.yml	\
 		platforms/flatpak/org.freeciv.gtk4.mp.yml	\
 		platforms/flatpak/org.freeciv.qt.yml	\
+		platforms/flatpak/org.freeciv.qt.mp.yml	\
 		platforms/flatpak/org.freeciv.sdl2.yml	\
 		platforms/flatpak/org.freeciv.ruledit.yml	\
 		platforms/macos/homebrew-appbundle.sh \
diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh
index 83d68d8301..aebdaa3563 100755
--- a/platforms/flatpak/build_flatpak.sh
+++ b/platforms/flatpak/build_flatpak.sh
@@ -23,6 +23,7 @@ if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state"
    ! 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 ||
    ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.ruledit.yml ||
+   ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.qt.mp.yml ||
    ! 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 ||
@@ -30,7 +31,8 @@ if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state"
    ! 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 ||
-   ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-ruledit-${FCVER}.flatpak" org.freeciv.ruledit
+   ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-ruledit-${FCVER}.flatpak" org.freeciv.ruledit ||
+   ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-qt-mp-${FCVER}.flatpak" org.freeciv.qt.mp
 then
   echo "FAILURE" >&2
   exit 1
diff --git a/platforms/flatpak/org.freeciv.qt.mp.yml b/platforms/flatpak/org.freeciv.qt.mp.yml
new file mode 100644
index 0000000000..def6e55f25
--- /dev/null
+++ b/platforms/flatpak/org.freeciv.qt.mp.yml
@@ -0,0 +1,25 @@
+app-id: org.freeciv.qt.mp
+runtime: org.kde.Platform
+runtime-version: '6.5'
+sdk: org.kde.Sdk
+command: freeciv-mp-qt
+rename-icon: freeciv-modpack
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --filesystem=~/.freeciv:create
+modules:
+  - name: freeciv-mp-qt
+    buildsystem: meson
+    no-autogen: true
+    config-opts:
+      - -Dfcmp=qt
+      - -Dclients=[]
+      - -Dserver=disabled
+      - -Dtools=[]
+      - -Dqtver=qt6
+    sources:
+      - type: dir
+        path: ../..
-- 
2.40.1