From 47c11246dfa0e46bd9901ccaa5363096da40ea1c Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 18 Dec 2022 13:34:03 +0200
Subject: [PATCH 41/41] flatpak: Move under platforms/ in source tree

See osdn #46309

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 Makefile.am                                            | 10 +++++-----
 {flatpak => platforms/flatpak}/.gitignore              |  0
 {flatpak => platforms/flatpak}/build_flatpak.sh        |  2 +-
 {flatpak => platforms/flatpak}/org.freeciv.gtk322.yml  |  2 +-
 {flatpak => platforms/flatpak}/org.freeciv.mp.gtk3.yml |  2 +-
 {flatpak => platforms/flatpak}/org.freeciv.qt.yml      |  2 +-
 {flatpak => platforms/flatpak}/org.freeciv.sdl2.yml    |  2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename {flatpak => platforms/flatpak}/.gitignore (100%)
 rename {flatpak => platforms/flatpak}/build_flatpak.sh (98%)
 rename {flatpak => platforms/flatpak}/org.freeciv.gtk322.yml (97%)
 rename {flatpak => platforms/flatpak}/org.freeciv.mp.gtk3.yml (97%)
 rename {flatpak => platforms/flatpak}/org.freeciv.qt.yml (97%)
 rename {flatpak => platforms/flatpak}/org.freeciv.sdl2.yml (97%)

diff --git a/Makefile.am b/Makefile.am
index 2ff97900d3..b6b14fb12c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,11 +82,11 @@ EXTRA_DIST =	autogen.sh 			\
 		m4/testmatic.m4			\
 		meson.build			\
 		meson_options.txt		\
-		flatpak/build_flatpak.sh	\
-		flatpak/org.freeciv.gtk322.yml	\
-		flatpak/org.freeciv.mp.gtk3.yml	\
-		flatpak/org.freeciv.qt.yml	\
-		flatpak/org.freeciv.sdl2.yml	\
+		platforms/flatpak/build_flatpak.sh	\
+		platforms/flatpak/org.freeciv.gtk322.yml	\
+		platforms/flatpak/org.freeciv.mp.gtk3.yml	\
+		platforms/flatpak/org.freeciv.qt.yml	\
+		platforms/flatpak/org.freeciv.sdl2.yml	\
 		platforms/macos/homebrew-appbundle.sh \
 		scripts/mapimg2anim		\
 		scripts/setup_auth_server.sh	\
diff --git a/flatpak/.gitignore b/platforms/flatpak/.gitignore
similarity index 100%
rename from flatpak/.gitignore
rename to platforms/flatpak/.gitignore
diff --git a/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh
similarity index 98%
rename from flatpak/build_flatpak.sh
rename to platforms/flatpak/build_flatpak.sh
index 681abcb97d..397e94216d 100755
--- a/flatpak/build_flatpak.sh
+++ b/platforms/flatpak/build_flatpak.sh
@@ -11,7 +11,7 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 
-FCVER=$(../fc_version)
+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 ||
diff --git a/flatpak/org.freeciv.gtk322.yml b/platforms/flatpak/org.freeciv.gtk322.yml
similarity index 97%
rename from flatpak/org.freeciv.gtk322.yml
rename to platforms/flatpak/org.freeciv.gtk322.yml
index 5fc4dc7f40..ad9242fe56 100644
--- a/flatpak/org.freeciv.gtk322.yml
+++ b/platforms/flatpak/org.freeciv.gtk322.yml
@@ -14,7 +14,7 @@ modules:
       - cd build && ../configure --prefix=/app --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
     sources:
       - type: dir
-        path: ..
+        path: ../..
 finish-args:
   - --socket=wayland
   - --socket=fallback-x11
diff --git a/flatpak/org.freeciv.mp.gtk3.yml b/platforms/flatpak/org.freeciv.mp.gtk3.yml
similarity index 97%
rename from flatpak/org.freeciv.mp.gtk3.yml
rename to platforms/flatpak/org.freeciv.mp.gtk3.yml
index 227f728aba..7e6e3bf152 100644
--- a/flatpak/org.freeciv.mp.gtk3.yml
+++ b/platforms/flatpak/org.freeciv.mp.gtk3.yml
@@ -14,7 +14,7 @@ modules:
       - cd build && ../configure --prefix=/app --enable-fcmp=gtk3 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install
     sources:
       - type: dir
-        path: ..
+        path: ../..
 finish-args:
   - --socket=wayland
   - --socket=fallback-x11
diff --git a/flatpak/org.freeciv.qt.yml b/platforms/flatpak/org.freeciv.qt.yml
similarity index 97%
rename from flatpak/org.freeciv.qt.yml
rename to platforms/flatpak/org.freeciv.qt.yml
index e3c4dc532e..030f59ec1c 100644
--- a/flatpak/org.freeciv.qt.yml
+++ b/platforms/flatpak/org.freeciv.qt.yml
@@ -14,7 +14,7 @@ modules:
       - cd build && ../configure --prefix=/app --with-qtver=qt5 --enable-client=qt --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
     sources:
       - type: dir
-        path: ..
+        path: ../..
 finish-args:
   - --socket=wayland
   - --socket=fallback-x11
diff --git a/flatpak/org.freeciv.sdl2.yml b/platforms/flatpak/org.freeciv.sdl2.yml
similarity index 97%
rename from flatpak/org.freeciv.sdl2.yml
rename to platforms/flatpak/org.freeciv.sdl2.yml
index 0f5875ba52..1cb7ff7cb2 100644
--- a/flatpak/org.freeciv.sdl2.yml
+++ b/platforms/flatpak/org.freeciv.sdl2.yml
@@ -19,7 +19,7 @@ modules:
       - cd build && ../configure --prefix=/app --enable-client=sdl2 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
     sources:
       - type: dir
-        path: ..
+        path: ../..
 finish-args:
   - --socket=wayland
   - --socket=fallback-x11
-- 
2.35.1