From 4e7bf948e0520200962661d13eb453535f42c2fb Mon Sep 17 00:00:00 2001 From: Guilherme Silva <626206+guihkx@users.noreply.github.com> Date: Fri, 13 Oct 2023 04:33:25 -0300 Subject: [PATCH] Linux: AppStream metadata validation and minor changes (#1132) * metainfo: add caption to the main screenshot * metainfo: add link to documentation * metainfo: add link to release notes * ci: validate Linux AppStream metadata --- resources/desktop/rssguard.metainfo.xml.in | 11 +++++++---- resources/scripts/github-actions/build-linux-mac.sh | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/resources/desktop/rssguard.metainfo.xml.in b/resources/desktop/rssguard.metainfo.xml.in index c47b84c56..cfc23d281 100644 --- a/resources/desktop/rssguard.metainfo.xml.in +++ b/resources/desktop/rssguard.metainfo.xml.in @@ -40,11 +40,12 @@ @APP_REVERSE_NAME@.desktop - - https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/graphics/official_pictures/main-window-linux.png + The main window + https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/graphics/official_pictures/main-window-linux.png https://github.com/martinrotter/rssguard + https://rssguard.readthedocs.io https://github.com/martinrotter/rssguard/issues https://github.com/sponsors/martinrotter https://crowdin.com/project/rssguard @@ -67,9 +68,11 @@ - + + https://github.com/martinrotter/rssguard/releases/tag/@APP_VERSION@ + @APP_LOW_NAME@ - \ No newline at end of file + diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index b18524c31..bf38f0f84 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -34,7 +34,7 @@ if [ $is_linux = true ]; then sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y sudo apt-get update - sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats + sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream-util sudo apt-get -qy install cmake ninja-build openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-nice gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-qt5 gstreamer1.0-pulseaudio # The script below performs some broken testing, which ends up tripping 'set -e'. @@ -83,6 +83,9 @@ cmake --build . cmake --install . --prefix "$prefix" if [ $is_linux = true ]; then + # Validate AppStream metadata. + echo 'Validating AppStream metadata...' + appstream-util validate-relax "$prefix/share/metainfo/$app_id.metainfo.xml" # Obtain linuxdeployqt. wget -qc https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage chmod a+x linuxdeployqt-continuous-x86_64.AppImage @@ -146,4 +149,4 @@ else fi mv "$imagename" "$imagenewname" -ls \ No newline at end of file +ls