From 7af41f128868db08cd8bd2f60249f47e64d02290 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 21 Jul 2023 19:19:06 +0300
Subject: [PATCH 7/7] Flatpak: Switch to autotools buildsystem

Stop defining individual build commands for
buildsystem: simple, by switching to buildsystem: autotools

See osdn #48430

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

diff --git a/flatpak/org.freeciv.gtk322.yml b/flatpak/org.freeciv.gtk322.yml
index e7c292b790..7911d7b55e 100644
--- a/flatpak/org.freeciv.gtk322.yml
+++ b/flatpak/org.freeciv.gtk322.yml
@@ -13,10 +13,13 @@ finish-args:
   - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-gtk3.22
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - cd build && ../configure --prefix=/app --enable-client=gtk3.22 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
+    buildsystem: autotools
+    no-autogen: true
+    builddir: true
+    config-opts:
+      - --enable-client=gtk3.22
+      - --disable-fcmp
+      - --disable-freeciv-manual
     sources:
       - type: dir
         path: ..
diff --git a/flatpak/org.freeciv.mp.gtk3.yml b/flatpak/org.freeciv.mp.gtk3.yml
index 3064e6de3b..4205b17e34 100644
--- a/flatpak/org.freeciv.mp.gtk3.yml
+++ b/flatpak/org.freeciv.mp.gtk3.yml
@@ -12,10 +12,14 @@ finish-args:
   - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-mp-gtk3
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - cd build && ../configure --prefix=/app --enable-fcmp=gtk3 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install
+    buildsystem: autotools
+    no-autogen: true
+    builddir: true
+    config-opts:
+      - --enable-fcmp=gtk3
+      - --disable-client
+      - --disable-server
+      - --disable-freeciv-manual
     sources:
       - type: dir
         path: ..
diff --git a/flatpak/org.freeciv.mp.gtk4.yml b/flatpak/org.freeciv.mp.gtk4.yml
index 00017a7194..462c24ad79 100644
--- a/flatpak/org.freeciv.mp.gtk4.yml
+++ b/flatpak/org.freeciv.mp.gtk4.yml
@@ -13,10 +13,14 @@ finish-args:
   - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-mp-gtk4
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - cd build && ../configure --prefix=/app --enable-fcmp=gtk4 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install
+    buildsystem: autotools
+    no-autogen: true
+    builddir: true
+    config-opts:
+      - --enable-fcmp=gtk4
+      - --disable-client
+      - --disable-server
+      - --disable-freeciv-manual
     sources:
       - type: dir
         path: ..
diff --git a/flatpak/org.freeciv.qt.yml b/flatpak/org.freeciv.qt.yml
index b8990cf0b9..54459d2bb8 100644
--- a/flatpak/org.freeciv.qt.yml
+++ b/flatpak/org.freeciv.qt.yml
@@ -13,10 +13,14 @@ finish-args:
   - --filesystem=~/.freeciv:create
 modules:
   - name: freeciv-qt
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - cd build && ../configure --prefix=/app --enable-client=qt --disable-fcmp --disable-ruledit --disable-freeciv-manual && make -j$(nproc) && make install
+    buildsystem: autotools
+    no-autogen: true
+    builddir: true
+    config-opts:
+      - --enable-client=qt
+      - --disable-fcmp
+      - --disable-ruledit
+      - --disable-freeciv-manual
     sources:
       - type: dir
         path: ..
diff --git a/flatpak/org.freeciv.sdl2.yml b/flatpak/org.freeciv.sdl2.yml
index 2dcf695b96..859f017135 100644
--- a/flatpak/org.freeciv.sdl2.yml
+++ b/flatpak/org.freeciv.sdl2.yml
@@ -19,10 +19,13 @@ modules:
         url: https://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz
         sha256: 63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262
   - name: freeciv-sdl2
-    buildsystem: simple
-    build-commands:
-      - mkdir build
-      - cd build && ../configure --prefix=/app --enable-client=sdl2 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install
+    buildsystem: autotools
+    no-autogen: true
+    builddir: true
+    config-opts:
+      - --enable-client=sdl2
+      - --disable-fcmp
+      - --disable-freeciv-manual
     sources:
       - type: dir
         path: ..
-- 
2.40.1