From b49c4bb26db7604b23fea0ef33d8d72af3e6a888 Mon Sep 17 00:00:00 2001
From: Manu <3916435+m3nu@users.noreply.github.com>
Date: Sun, 10 Nov 2024 17:44:19 +0000
Subject: [PATCH] Build and packaging fixes (#2126)

---
 .github/actions/install-dependencies/action.yml          | 2 +-
 .github/workflows/build-macos.yml                        | 2 +-
 .github/workflows/test.yml                               | 5 +++++
 src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml | 4 +---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
index e888476a..3031b875 100644
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -13,7 +13,7 @@ runs:
             libxkbcommon-x11-0 dbus-x11 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 \
             libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libxcb-shape0 \
             libegl1 libxcb-cursor0 libfuse-dev libsqlite3-dev libfuse3-dev pkg-config \
-            python3-pkgconfig libxxhash-dev borgbackup
+            python3-pkgconfig libxxhash-dev borgbackup appstream
 
     - name: Install system dependencies (macOS)
       if: runner.os == 'macOS'
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 8e3adf2f..c55bc37e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -48,7 +48,7 @@ jobs:
     - name: Package with PyInstaller
       run: |
         pyinstaller --clean --noconfirm package/vorta.spec
-        cp -R /opt/homebrew/Caskroom/sparkle/*/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
+        cp -R $(brew --prefix)/Caskroom/sparkle/*/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
         curl -LJO https://github.com/borgbackup/borg/releases/download/${{ github.event.inputs.borg_version }}/borg-macos1012.tgz
         tar xvf borg-macos1012.tgz -C dist/Vorta.app/Contents/Resources/
         cd dist && zip -rq --symlinks Vorta.zip Vorta.app
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d78041a..1515c385 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,6 +69,11 @@ jobs:
           python-version: ${{ matrix.python-version }}
           install-nox: true
 
+      - name: Validate Flatpak manifest
+        if: runner.os == 'Linux'
+        shell: bash
+        run: appstreamcli validate ./src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
+
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
diff --git a/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
index 13784ff1..0286c4e0 100644
--- a/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
+++ b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
@@ -44,9 +44,7 @@
   <releases>
     <release version="v0.10.0" date="2024-11-10" urgency="low">
       <description>
-        <p>See <a href="https://github.com/borgbase/vorta/releases">Github</a>
-            for detailed release notes.
-        </p>
+        See Github for detailed release notes: github.com/borgbase/vorta/releases
       </description>
     </release>
   </releases>