From 920041c3a09f2c86470bbf958b39309e9a9c5080 Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 4 May 2022 22:55:08 +0200 Subject: [PATCH] desktop: gimp-data-extras AppStream was moved to the appropriate repo. See the commit 28467cb on the gimp-data-extras repo where I moved this data in. Not sure why this metadata file was ever pushed to the main repo as it is obviously for the data-extras package (or else I am missing some information!). The old 2017 report where it was originally added: https://bugzilla.gnome.org/show_bug.cgi?id=763398 --- configure.ac | 3 +- desktop/.gitignore | 2 -- desktop/Makefile.am | 5 ++- desktop/meson.build | 31 ------------------- ...g.gimp.GIMP.data_extras.metainfo.xml.in.in | 13 -------- desktop/test-appdata.sh.in | 1 - po/POTFILES.in | 1 - po/POTFILES.skip | 1 - 8 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in diff --git a/configure.ac b/configure.ac index 09299a1f01..67bca33170 100644 --- a/configure.ac +++ b/configure.ac @@ -2671,7 +2671,7 @@ if test "x$with_appdata_test" != "xno"; then have_appstreamcli="no (appstreamcli not found)" fi fi -AM_CONDITIONAL(HAVE_APPSTREAM_UTIL, test "x$have_appstreamcli" = "xyes") +AM_CONDITIONAL(HAVE_APPSTREAMCLI, test "x$have_appstreamcli" = "xyes") if test "x$have_appstreamcli" = "xyes"; then have_appstreamcli="yes (this test requires network access; --without-appdata-test to disable)" fi @@ -3212,7 +3212,6 @@ data/tool-presets/Paint/Makefile data/tool-presets/Selection/Makefile data/tool-presets/Sketch/Makefile desktop/Makefile -desktop/org.gimp.GIMP.data_extras.metainfo.xml.in desktop/gimp.desktop.in desktop/org.gimp.GIMP.appdata.xml.in desktop/test-appdata.sh diff --git a/desktop/.gitignore b/desktop/.gitignore index cc57f475d9..044b9e8191 100644 --- a/desktop/.gitignore +++ b/desktop/.gitignore @@ -4,7 +4,5 @@ /org.gimp.GIMP.appdata.xml /gimp.desktop.in /gimp.desktop -/org.gimp.GIMP.data_extras.metainfo.xml.in -/org.gimp.GIMP.data_extras.metainfo.xml /test-appdata.sh /.thumbnails diff --git a/desktop/Makefile.am b/desktop/Makefile.am index f076920d01..d844579156 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -6,8 +6,7 @@ desktop_in_files = \ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) appstream_in_files = \ - org.gimp.GIMP.appdata.xml.in \ - org.gimp.GIMP.data_extras.metainfo.xml.in + org.gimp.GIMP.appdata.xml.in appstream_files = $(appstream_in_files:.xml.in=.xml) @@ -87,7 +86,7 @@ TESTS_ENVIRONMENT = \ GIMP_TESTING_ABS_TOP_BUILDDIR=@abs_top_builddir@ TESTS = -if HAVE_APPSTREAM_UTIL +if HAVE_APPSTREAMCLI TESTS += test-appdata.sh endif diff --git a/desktop/meson.build b/desktop/meson.build index 34919da574..618c19e884 100644 --- a/desktop/meson.build +++ b/desktop/meson.build @@ -71,28 +71,6 @@ appdatafile = custom_target(appdatafilename, install_dir: get_option('datadir') / 'metainfo', ) -metainfofilename = 'org.gimp.GIMP.data_extras.metainfo.xml' -metainfofilein = configure_file( - input : metainfofilename+'.in.in', - output: metainfofilename+'.in', - configuration: desktop_conf, -) -metainfofile = custom_target(metainfofilename, - input : [ metainfofilein, ], - output: [ metainfofilename, ], - command: [ - intltool_merge, - po_dir, - '@INPUT@', - '@OUTPUT@', - '--xml-style', - '--utf8', - '--cache=' + '@OUTDIR@' / 'intltool-merge-cache', - ], - install: true, - install_dir: get_option('datadir') / 'metainfo', -) - if desktop_validate.found() test('validate-desktop', desktop_validate, @@ -110,13 +88,4 @@ if appstreamcli.found() ], suite: 'desktop', ) - - test('metainfo_file', - appstreamcli, - args: [ 'validate', metainfofile ], - env: [ - 'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.build_root(), - ], - suite: 'desktop', - ) endif diff --git a/desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in b/desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in deleted file mode 100644 index 1251987f0e..0000000000 --- a/desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in +++ /dev/null @@ -1,13 +0,0 @@ - - - - org.gimp.GIMP.data_extras - org.gimp.GIMP - <_name>Extra files for GIMP - <_summary>Patterns, gradients, and other extra files for GIMP - https://www.gimp.org/ - @BUG_REPORT_URL@ - CC0-1.0 - GPL-3.0+ - alexandre.prokoudine@gmail.com - diff --git a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in index 8fe3e80749..a8f1160455 100755 --- a/desktop/test-appdata.sh.in +++ b/desktop/test-appdata.sh.in @@ -3,7 +3,6 @@ # 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 && \ -appstreamcli validate ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.data_extras.metainfo.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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 29a46f96b1..b310e0a72f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,6 @@ [encoding: UTF-8] desktop/org.gimp.GIMP.appdata.xml.in.in -desktop/org.gimp.GIMP.data_extras.metainfo.xml.in.in desktop/gimp.desktop.in.in app/about.h diff --git a/po/POTFILES.skip b/po/POTFILES.skip index eaeaad5325..7e957d8dd4 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -3,7 +3,6 @@ build/windows/installer/lang/setup.isl.in data/tags/gimp-tags-default.xml.in data/tips/gimp-tips.xml.in desktop/org.gimp.GIMP.appdata.xml.in -desktop/org.gimp.GIMP.data_extras.metainfo.xml.in desktop/gimp.desktop.in extensions libgimp