Adapt flatpak build to use meson

3 files changed, 27 insertions, 39 deletions

diff --git a/build-aux/cargo-sources.json b/build-aux/flatpak/cargo-sources.json
index 39d6702..39d6702 100644
--- a/build-aux/cargo-sources.json
+++ b/build-aux/flatpak/cargo-sources.json
diff --git a/build-aux/flatpak/systems.tranquil.Map.yml b/build-aux/flatpak/systems.tranquil.Map.yml
new file mode 100644
index 0000000..5d733b1
--- /dev/null
+++ b/build-aux/flatpak/systems.tranquil.Map.yml
@@ -0,0 +1,27 @@
+id: systems.tranquil.Map
+runtime: org.gnome.Platform
+runtime-version: '50'
+sdk: org.gnome.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.rust-stable
+command: map
+finish-args:
+  - --device=dri
+  - --share=ipc
+  - --socket=wayland
+  - --socket=fallback-x11
+modules:
+  - name: map
+    buildsystem: meson
+    build-options:
+      append-path: /usr/lib/sdk/rust-stable/bin
+      env:
+        CARGO_NET_OFFLINE: 'true'
+    sources:
+      - type: dir
+        path: ../..
+      - cargo-sources.json
+      - type: shell
+        commands:
+          - mkdir -p .cargo
+          - cp -vf cargo/config .cargo/config.toml
diff --git a/build-aux/systems.tranquil.Map.yml b/build-aux/systems.tranquil.Map.yml
deleted file mode 100644
index ed5642e..0000000
--- a/build-aux/systems.tranquil.Map.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-id: systems.tranquil.Map
-runtime: org.gnome.Platform
-runtime-version: '50'
-sdk: org.gnome.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.rust-stable
-command: map
-finish-args:
-  - --device=dri
-  - --share=ipc
-  - --socket=wayland
-  - --socket=fallback-x11
-modules:
-  - name: map
-    buildsystem: simple
-    build-options:
-      append-path: /usr/lib/sdk/rust-stable/bin
-      env:
-        CARGO_HOME: /run/build/map/cargo
-        CARGO_NET_OFFLINE: 'true'
-    build-commands:
-      - cargo --offline fetch --manifest-path Cargo.toml --verbose
-      - cargo build --offline --release --all-features
-      - install -Dm0755 target/release/map ${FLATPAK_DEST}/bin/map
-      - install -Dm0644 resources/logo.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
-      - install -Dm0644 resources/${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
-      - install -Dm0644 resources/${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml
-      - install -Dm0644 resources/${FLATPAK_ID}.service ${FLATPAK_DEST}/share/dbus-1/services/${FLATPAK_ID}.service
-      - install -Dm0644 resources/wmap.lang ${FLATPAK_DEST}/share/gtksourceview-5/language-specs/wmap.lang
-      - |
-        for po_file in po/*.po; do
-          locale=$(basename "$po_file" .po)
-          mkdir -p ${FLATPAK_DEST}/share/locale/${locale}/LC_MESSAGES
-          msgfmt "$po_file" -o ${FLATPAK_DEST}/share/locale/${locale}/LC_MESSAGES/${FLATPAK_ID}.mo
-        done
-    sources:
-      - type: dir
-        path: ..
-      - cargo-sources.json