From 32689460958f2973a0d93b12b7f9961fcbf0039c Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 3 Oct 2021 00:12:54 +0200 Subject: [PATCH 1/2] metainfo.xml: Remove tags to avoid appstream-util parser errors Before this commit, appstream-util fails to validate this document due the following error: $ appstream-util validate-relax res/linux/org.mixxx.Mixxx.metainfo.xml res/linux/org.mixxx.Mixxx.metainfo.xml: failed to parse res/linux/org.mixxx.Mixxx.metainfo.xml: Error on line 267 char 5:
  • already set 'It is no longer necessary to manually copy the udev rule file in packaging scripts. Now pkg-config is used to determine the udevdir used to install the rules file in the CMake install step when CMAKE_INSTALL_PREFIX is' and tried to replace with ' or ' --- res/linux/org.mixxx.Mixxx.metainfo.xml | 32 +++++++------------------- tools/update_metainfo.py | 7 ++++++ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 312e8710999..084e565e1f6 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -260,13 +260,9 @@
    • It is no longer necessary to manually copy the udev rule file in packaging scripts. Now pkg-config is used to determine the udevdir used to install the rules file in the CMake install step when CMAKE_INSTALL_PREFIX is - - / - + / or - - /usr - + /usr . #4126
      • @@ -553,9 +549,7 @@
      • Add support for searching for empty fields (for example - - crate:"" - + crate:"" ) lp:1788086
        • @@ -794,26 +788,18 @@
        • Add CMake build system with - - ccache - + ccache and - - sccache - + sccache support for faster compilation times and remove SCons #2280 #3618
        • Make Mixxx compile even though - - QT_NO_OPENGL - + QT_NO_OPENGL or - - QT_OPENGL_ES_2 - + QT_OPENGL_ES_2 is defined (fixes build on Raspberry Pi) lp:1863440 #2504 @@ -845,9 +831,7 @@
        • Derive Mixxx version from - - git describe - + git describe #3824 #3841 #3848 diff --git a/tools/update_metainfo.py b/tools/update_metainfo.py index 694c6244c1c..c93b39a863c 100755 --- a/tools/update_metainfo.py +++ b/tools/update_metainfo.py @@ -46,6 +46,13 @@ def parse_changelog(content): new_tag = soup.new_tag("p") new_tag.string = tag.get_text() tag.replace_with(new_tag) + + # Although the `` tag is theoretically supported, it apparently + # leads to parser errors when using `appstream-util validate-relax` (as + # of version 0.7.18). + for tag in soup.find_all("code"): + tag.replace_with(tag.get_text()) + desc = soup.new_tag("description") desc.extend(soup.contents) From fe305e4d2049ac5d76781cec25ac9dab0e7c2c82 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 3 Oct 2021 00:44:58 +0200 Subject: [PATCH 2/2] metainfo.xml: Use 1600x1200px screenshots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following appstream-util validation errors: • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/deere-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/deere-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/shade-classic-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/shade-classic-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/shade-dark-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/shade-dark-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-3840x2160.png] maximum is 900px • attribute-invalid : width too large [https://mixxx.org/theme/images/2.3/screenshots/tango-3840x2160.png] maximum is 1600px • attribute-invalid : height too large [https://mixxx.org/theme/images/2.3/screenshots/tango-3840x2160.png] maximum is 900px --- res/linux/org.mixxx.Mixxx.metainfo.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 084e565e1f6..6665ac4a4f9 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -59,31 +59,31 @@ - https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-1600x1200.png Mixxx with the default LateNight PaleMoon skin - https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-1600x1200.png Mixxx with the LateNight Classic skin - https://mixxx.org/theme/images/2.3/screenshots/deere-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/deere-1600x1200.png Mixxx with the Deere skin - https://mixxx.org/theme/images/2.3/screenshots/shade-classic-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/shade-classic-1600x1200.png Mixxx with the Shade Classic skin - https://mixxx.org/theme/images/2.3/screenshots/shade-dark-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/shade-dark-1600x1200.png Mixxx with the Shade Dark skin - https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-1600x1200.png Mixxx with the Shade Summer Sunset skin - https://mixxx.org/theme/images/2.3/screenshots/tango-3840x2160.png + https://mixxx.org/theme/images/2.3/screenshots/tango-1600x1200.png Mixxx with the Tango skin