From 6e87900e355a6ad9da5f506b68b1a9f89b927a3c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 12 Feb 2023 23:36:07 +0200 Subject: [PATCH 31/31] flatpak: Add gtk4 modpack installer flatpak See osdn #47286 Signed-off-by: Marko Lindqvist --- Makefile.am | 1 + platforms/flatpak/build_flatpak.sh | 2 ++ platforms/flatpak/org.freeciv.mp.gtk4.yml | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 platforms/flatpak/org.freeciv.mp.gtk4.yml diff --git a/Makefile.am b/Makefile.am index b76a4e6d73..34a3d25a29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,7 @@ EXTRA_DIST = autogen.sh \ platforms/flatpak/org.freeciv.gtk322.yml \ platforms/flatpak/org.freeciv.gtk4.yml \ platforms/flatpak/org.freeciv.mp.gtk3.yml \ + platforms/flatpak/org.freeciv.mp.gtk4.yml \ platforms/flatpak/org.freeciv.qt.yml \ platforms/flatpak/org.freeciv.sdl2.yml \ platforms/macos/homebrew-appbundle.sh \ diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh index 93d33e7d40..cf2d197a97 100755 --- a/platforms/flatpak/build_flatpak.sh +++ b/platforms/flatpak/build_flatpak.sh @@ -15,12 +15,14 @@ FCVER=$(../../fc_version) if ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.gtk4.yml || ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.gtk322.yml || + ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.mp.gtk4.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-builder --user --repo=repo --force-clean build org.freeciv.sdl2.yml || ! flatpak build-update-repo repo || ! flatpak build-bundle repo "freeciv-gtk4-${FCVER}.flatpak" org.freeciv.gtk4 || ! flatpak build-bundle repo "freeciv-gtk3.22-${FCVER}.flatpak" org.freeciv.gtk322 || + ! flatpak build-bundle repo "freeciv-mp-gtk4-${FCVER}.flatpak" org.freeciv.mp.gtk4 || ! flatpak build-bundle repo "freeciv-mp-gtk3-${FCVER}.flatpak" org.freeciv.mp.gtk3 || ! flatpak build-bundle repo "freeciv-qt-${FCVER}.flatpak" org.freeciv.qt || ! flatpak build-bundle repo "freeciv-sdl2-${FCVER}.flatpak" org.freeciv.sdl2 diff --git a/platforms/flatpak/org.freeciv.mp.gtk4.yml b/platforms/flatpak/org.freeciv.mp.gtk4.yml new file mode 100644 index 0000000000..48b3b6216f --- /dev/null +++ b/platforms/flatpak/org.freeciv.mp.gtk4.yml @@ -0,0 +1,23 @@ +app-id: org.freeciv.mp.gtk4 +runtime: org.gnome.Platform +runtime-version: '42' +sdk: org.gnome.Sdk +command: freeciv-mp-gtk4 +rename-icon: freeciv-modpack +modules: + - name: freeciv-mp-gtk4 + 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-fcmp=gtk4 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install + sources: + - type: dir + path: ../.. +finish-args: + - --socket=wayland + - --socket=fallback-x11 + - --share=ipc + - --share=network + - --filesystem=~/.freeciv:create -- 2.39.1