From 7fef35ce0a157eca96c6fe3e058ebeba979a32d4 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 10 Feb 2026 15:26:40 -0800 Subject: [PATCH] Ship metainfo in deb, remove from Flatpak manifest --- .github/workflows/flathub.yml | 1 - crates-tauri/yaak-app/tauri.release.conf.json | 32 +++++++------------ flatpak/app.yaak.Yaak.yml | 3 -- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/flathub.yml b/.github/workflows/flathub.yml index 647627b9..98d95e02 100644 --- a/.github/workflows/flathub.yml +++ b/.github/workflows/flathub.yml @@ -29,7 +29,6 @@ jobs: - name: Copy updated files to Flathub repo run: | cp flatpak/app.yaak.Yaak.yml flathub-repo/ - cp flatpak/app.yaak.Yaak.metainfo.xml flathub-repo/ cp LICENSE flathub-repo/ sed -i 's|path: \.\./LICENSE|path: LICENSE|' flathub-repo/app.yaak.Yaak.yml diff --git a/crates-tauri/yaak-app/tauri.release.conf.json b/crates-tauri/yaak-app/tauri.release.conf.json index 20ad2868..a6b4ebfa 100644 --- a/crates-tauri/yaak-app/tauri.release.conf.json +++ b/crates-tauri/yaak-app/tauri.release.conf.json @@ -1,9 +1,6 @@ { "build": { - "features": [ - "updater", - "license" - ] + "features": ["updater", "license"] }, "app": { "security": { @@ -11,12 +8,8 @@ "default", { "identifier": "release", - "windows": [ - "*" - ], - "permissions": [ - "yaak-license:default" - ] + "windows": ["*"], + "permissions": ["yaak-license:default"] } ] } @@ -39,14 +32,7 @@ "createUpdaterArtifacts": true, "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC", "shortDescription": "Play with APIs, intuitively", - "targets": [ - "app", - "appimage", - "deb", - "dmg", - "nsis", - "rpm" - ], + "targets": ["app", "appimage", "deb", "dmg", "nsis", "rpm"], "macOS": { "minimumSystemVersion": "13.0", "exceptionDomain": "", @@ -58,10 +44,16 @@ }, "linux": { "deb": { - "desktopTemplate": "./template.desktop" + "desktopTemplate": "./template.desktop", + "files": { + "usr/share/metainfo/app.yaak.Yaak.metainfo.xml": "../../flatpak/app.yaak.Yaak.metainfo.xml" + } }, "rpm": { - "desktopTemplate": "./template.desktop" + "desktopTemplate": "./template.desktop", + "files": { + "usr/share/metainfo/app.yaak.Yaak.metainfo.xml": "../../flatpak/app.yaak.Yaak.metainfo.xml" + } } } } diff --git a/flatpak/app.yaak.Yaak.yml b/flatpak/app.yaak.Yaak.yml index 44f9be31..ad4e5817 100644 --- a/flatpak/app.yaak.Yaak.yml +++ b/flatpak/app.yaak.Yaak.yml @@ -42,7 +42,6 @@ modules: - mv usr/bin/* /app/bin - mv usr/lib/* /app/lib - mv usr/share/* /app/share - - install -Dm644 app.yaak.Yaak.metainfo.xml /app/share/metainfo/app.yaak.Yaak.metainfo.xml - install -Dm644 LICENSE /app/share/licenses/app.yaak.Yaak/LICENSE sources: @@ -58,7 +57,5 @@ modules: sha256: "9ba9b7c9df56ffb9b801e40cb38685f1650cf7e2f9e85dad0ae3329f8e01ff6d" only-arches: - aarch64 - - type: file - path: app.yaak.Yaak.metainfo.xml - type: file path: ../LICENSE