From a77728d88fdd4c617a239a49a1a65359e0027af6 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 9 Apr 2023 20:44:07 +0300
Subject: [PATCH 42/42] flatpak .yml: Move finish-args before modules

Requested by hfiguiere

See osdn #47760

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 flatpak/org.freeciv.gtk322.yml  | 14 +++++++-------
 flatpak/org.freeciv.gtk4.yml    | 14 +++++++-------
 flatpak/org.freeciv.mp.gtk3.yml | 12 ++++++------
 flatpak/org.freeciv.mp.gtk4.yml | 12 ++++++------
 flatpak/org.freeciv.qt.yml      | 14 +++++++-------
 flatpak/org.freeciv.sdl2.yml    | 16 ++++++++--------
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/flatpak/org.freeciv.gtk322.yml b/flatpak/org.freeciv.gtk322.yml
index 85a084b62b..372f5b9417 100644
--- a/flatpak/org.freeciv.gtk322.yml
+++ b/flatpak/org.freeciv.gtk322.yml
@@ -4,6 +4,13 @@ runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-gtk3.22
 rename-icon: freeciv-client
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-gtk3.22
     buildsystem: simple
@@ -15,10 +22,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --share=network
-  - --socket=pulseaudio
-  - --filesystem=~/.freeciv:create
diff --git a/flatpak/org.freeciv.gtk4.yml b/flatpak/org.freeciv.gtk4.yml
index a800e7750a..109b6a5211 100644
--- a/flatpak/org.freeciv.gtk4.yml
+++ b/flatpak/org.freeciv.gtk4.yml
@@ -4,6 +4,13 @@ runtime-version: '44'
 sdk: org.gnome.Sdk
 command: freeciv-gtk4
 rename-icon: freeciv-client
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-gtk4
     buildsystem: simple
@@ -15,10 +22,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --share=network
-  - --socket=pulseaudio
-  - --filesystem=~/.freeciv:create
diff --git a/flatpak/org.freeciv.mp.gtk3.yml b/flatpak/org.freeciv.mp.gtk3.yml
index b5326b4402..d5e786f0f3 100644
--- a/flatpak/org.freeciv.mp.gtk3.yml
+++ b/flatpak/org.freeciv.mp.gtk3.yml
@@ -4,6 +4,12 @@ runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-mp-gtk3
 rename-icon: freeciv-modpack
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-mp-gtk3
     buildsystem: simple
@@ -15,9 +21,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --share=network
-  - --filesystem=~/.freeciv:create
diff --git a/flatpak/org.freeciv.mp.gtk4.yml b/flatpak/org.freeciv.mp.gtk4.yml
index 1a77a482c9..4c9de11455 100644
--- a/flatpak/org.freeciv.mp.gtk4.yml
+++ b/flatpak/org.freeciv.mp.gtk4.yml
@@ -4,6 +4,12 @@ runtime-version: '44'
 sdk: org.gnome.Sdk
 command: freeciv-mp-gtk4
 rename-icon: freeciv-modpack
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-mp-gtk4
     buildsystem: simple
@@ -15,9 +21,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --share=network
-  - --filesystem=~/.freeciv:create
diff --git a/flatpak/org.freeciv.qt.yml b/flatpak/org.freeciv.qt.yml
index f80de08630..6e41abe307 100644
--- a/flatpak/org.freeciv.qt.yml
+++ b/flatpak/org.freeciv.qt.yml
@@ -4,6 +4,13 @@ runtime-version: '6.4'
 sdk: org.kde.Sdk
 command: freeciv-qt
 rename-icon: freeciv-client
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-qt
     buildsystem: simple
@@ -15,10 +22,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --share=network
-  - --socket=pulseaudio
-  - --filesystem=~/.freeciv:create
diff --git a/flatpak/org.freeciv.sdl2.yml b/flatpak/org.freeciv.sdl2.yml
index d48832d568..9621d69978 100644
--- a/flatpak/org.freeciv.sdl2.yml
+++ b/flatpak/org.freeciv.sdl2.yml
@@ -4,6 +4,14 @@ runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-sdl2
 rename-icon: freeciv-client
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=ipc
+  - --device=dri
+  - --share=network
+  - --socket=pulseaudio
+  - --filesystem=~/.freeciv:create
 modules:
   - name: sdl2-gfx
     sources:
@@ -20,11 +28,3 @@ modules:
     sources:
       - type: dir
         path: ..
-finish-args:
-  - --socket=wayland
-  - --socket=fallback-x11
-  - --share=ipc
-  - --device=dri
-  - --share=network
-  - --socket=pulseaudio
-  - --filesystem=~/.freeciv:create
-- 
2.39.2