[gnome-software] Mark featured AppStream snippets as append-merge components

[Richard Hughes <rhughes src gnome org>]

commit 7c1620990b6361fac370b76c9828f8f77ff77a72
Author: Matthias Klumpp <matthias tenstral net>
Date:   Sun Jan 5 05:42:53 2020 +0100

    Mark featured AppStream snippets as append-merge components
    
    The components in collection XML have to be marked with a merge mode
    explicitly if they are expected to be joined together with other
    component metadata. Otherwise they will be read as separate new, but
    invalid, generic components.
    This change ensures the GNOME Software metadata additions get registered
    no matter which AppStream implementation is used.

 data/assets/org.gnome.Software.Featured.xml | 58 ++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/data/assets/org.gnome.Software.Featured.xml b/data/assets/org.gnome.Software.Featured.xml
index 524611df..ce8b493f 100644
--- a/data/assets/org.gnome.Software.Featured.xml
+++ b/data/assets/org.gnome.Software.Featured.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components>
-  <component>
+  <component merge="append">
     <id>inkscape.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #ccc;
@@ -13,7 +13,7 @@ background:
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>mypaint.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #888;
@@ -27,7 +27,7 @@ box-shadow: none;
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Maps.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #deddda;
@@ -42,7 +42,7 @@ background: #f6f5f4,
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Polari.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #4e9a06;
@@ -57,7 +57,7 @@ background:
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>transmission-gtk.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #d65100;
@@ -72,7 +72,7 @@ background:
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Podcasts</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #d7430a;
@@ -83,7 +83,7 @@ color: #fff;
 text-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Boxes.desktop</id>
     <categories>
       <category>Featured</category>
@@ -96,7 +96,7 @@ color: #cd6234;
 text-shadow: 0 1px rgba(255,255,255,0.3);</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.github.johnfactotum.Foliate</id>
     <categories>
       <category>Featured</category>
@@ -113,7 +113,7 @@ text-shadow: none;
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.SoundRecorder.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #bbb;
@@ -125,7 +125,7 @@ color: #fff;
 text-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.kde.kdenlive</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #df321e;
@@ -136,7 +136,7 @@ box-shadow: none;
 text-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gimp.GIMP</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #4a8c30;
@@ -149,7 +149,7 @@ background:
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.videolan.VLC</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #df321e;
@@ -161,7 +161,7 @@ box-shadow: none;
 text-shadow: 0 0 2px #fff;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.spotify.Client</id>
     <categories>
       <category>Featured</category>
@@ -175,7 +175,7 @@ background: url('http://people.gnome.org/~jimmac/gnome-software/spotify-logo.svg
  10% / 200px auto no-repeat, -gtk-gradient (linear, left top, left bottom, from(#b47fba), to(#000));</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.slack.Slack</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #eee;
@@ -185,7 +185,7 @@ color: #fff;
 text-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.FeedReader</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #d65100;
@@ -198,7 +198,7 @@ background: #f5c211
 </value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.bitwarden.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #1c6d8c;
@@ -210,7 +210,7 @@ color: #fff;
 text-shadow: 0 0 2px #26a269;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.dropbox.Client</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #a8c3d6;
@@ -221,7 +221,7 @@ background: #b8d3e6 url('file://@datadir@/gnome-software/featured-dropbox.png')
 color: #47525d;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.github.calo001.fondo</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;
@@ -233,7 +233,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.darktable.Darktable</id>
     <categories>
       <category>Featured</category>
@@ -247,7 +247,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.calibre_ebook.calibre</id>
     <categories>
       <category>Featured</category>
@@ -261,7 +261,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>fr.free.Homebank</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;
@@ -272,7 +272,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>de.wolfvollprecht.UberWriter</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #0554c4;
@@ -284,7 +284,7 @@ text-shadow: 0 0 3px #3584e4;
 box-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>net.sourceforge.Klavaro</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;
@@ -295,7 +295,7 @@ box-shadow: none;
 text-shadow: 0 0 4px #fff;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.github.junrrein.PDFSlicer</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid #1c6d8c;
@@ -307,7 +307,7 @@ color: #fff;
 text-shadow: none;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Todo.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;
@@ -318,7 +318,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.github.fabiocolacio.marker</id>
     <categories>
       <category>Featured</category>
@@ -332,7 +332,7 @@ box-shadow: none;
 text-shadow: 0 1px 2px #000;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>com.valvesoftware.Steam</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #1b2838;
@@ -343,7 +343,7 @@ background: #1b2838 url('http://people.gnome.org/~jimmac/gnome-software/steam-lo
  10% / 200px auto no-repeat;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.gnome.Tetravex</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;
@@ -354,7 +354,7 @@ box-shadow: none;
 text-shadow: 0 0 2px #fff;</value>
     </custom>
   </component>
-  <component>
+  <component merge="append">
     <id>org.stellarium.Stellarium</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border: 1px solid transparent;