From 8d1165c46268010ff020ff92cef1959d7bcfebdb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 24 May 2023 00:30:04 +0300 Subject: [PATCH 8/9] flatpak: Add ruledit flatpak See osdn #47634 Signed-off-by: Marko Lindqvist --- Makefile.am | 1 + platforms/flatpak/build_flatpak.sh | 4 +++- platforms/flatpak/org.freeciv.ruledit.yml | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 platforms/flatpak/org.freeciv.ruledit.yml diff --git a/Makefile.am b/Makefile.am index 5f87b6125b..f7392430e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ EXTRA_DIST = autogen.sh \ platforms/flatpak/org.freeciv.mp.gtk4.yml \ platforms/flatpak/org.freeciv.qt.yml \ platforms/flatpak/org.freeciv.sdl2.yml \ + platforms/flatpak/org.freeciv.ruledit.yml \ platforms/macos/homebrew-appbundle.sh \ scripts/mapimg2anim \ scripts/setup_auth_server.sh \ diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh index cf2d197a97..363938642d 100755 --- a/platforms/flatpak/build_flatpak.sh +++ b/platforms/flatpak/build_flatpak.sh @@ -19,13 +19,15 @@ if ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.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-builder --user --repo=repo --force-clean build org.freeciv.ruledit.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 + ! flatpak build-bundle repo "freeciv-sdl2-${FCVER}.flatpak" org.freeciv.sdl2 || + ! flatpak build-bundle repo "freeciv-ruledit-${FCVER}.flatpak" org.freeciv.ruledit then echo "FAILURE" >&2 exit 1 diff --git a/platforms/flatpak/org.freeciv.ruledit.yml b/platforms/flatpak/org.freeciv.ruledit.yml new file mode 100644 index 0000000000..0947b8b5d2 --- /dev/null +++ b/platforms/flatpak/org.freeciv.ruledit.yml @@ -0,0 +1,22 @@ +app-id: org.freeciv.ruledit +runtime: org.kde.Platform +runtime-version: '6.4' +sdk: org.kde.Sdk +command: freeciv-ruledit +rename-icon: freeciv-ruledit +finish-args: + - --socket=wayland + - --socket=fallback-x11 + - --share=ipc + - --filesystem=~/.freeciv:create +modules: + - name: freeciv-ruledit + 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 --with-qtver=qt6 --enable-ruledit --disable-client --disable-fcmp --disable-freeciv-manual --disable-server && make -j$(nproc) && make install + sources: + - type: dir + path: ../.. -- 2.39.2