From 3da0cdc03df8fa2183ef4202c54fe89c90a9fc47 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sat, 27 May 2023 00:16:47 +0200 Subject: [PATCH] desktop: removing autotools-only test files. These are implemented directly in the meson build files. --- desktop/meson.build | 11 +++++++++++ desktop/test-appdata.sh.in | 14 -------------- desktop/test-desktop.sh | 3 --- 3 files changed, 11 insertions(+), 17 deletions(-) delete mode 100755 desktop/test-appdata.sh.in delete mode 100755 desktop/test-desktop.sh diff --git a/desktop/meson.build b/desktop/meson.build index fa267fa932..19784a5b2b 100644 --- a/desktop/meson.build +++ b/desktop/meson.build @@ -8,6 +8,15 @@ sizes = [ '256', ] + +# XXX: the old autotools build used to `touch` the (datadir) /icons/hicolor +# folder at install time in order to comply with the "Icon Theme Specification" +# (see the "Implementation Notes" section about changing the mtime of the +# toplevel icon directory after installing/updating icon themes). +# This part was not reimplemented in our meson build. Unsure if this is still +# needed or even if this is the role of the application build to take care of +# this. + foreach size : sizes sizedir = size+'x'+size install_data(sizedir / 'gimp.png', @@ -65,6 +74,8 @@ if desktop_validate.found() endif if appstreamcli.found() + # TODO: should we use validate-strict when the last errors for a strict + # validation are fixed? test('appdata_file', appstreamcli, args: [ 'validate', appdatafile ], diff --git a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in deleted file mode 100755 index a8f1160455..0000000000 --- a/desktop/test-appdata.sh.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# TODO: use validate-strict when the last errors for a strict validation -# are fixed. -appstreamcli validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \ -if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then - grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml - if [ $? = 0 ]; then - echo "ERROR: stable version with remaining TODOs in appdata." - false - fi -else - true -fi diff --git a/desktop/test-desktop.sh b/desktop/test-desktop.sh deleted file mode 100755 index 6794034d8e..0000000000 --- a/desktop/test-desktop.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -desktop-file-validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp.desktop