[gnome-software/1649-support-appstream-merging] gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup()

[Milan Crha <mcrha src gnome org>]

commit 32578011529dbcafb249acb53e79cfc46b491a4d
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 31 12:24:50 2022 +0200

    gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup()
    
    This will merge information from the .desktop files and system merge components
    into the corresponding appstream data.

 plugins/core/gs-plugin-appstream.c | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
index 2ceb94794..70d68b5c3 100644
--- a/plugins/core/gs-plugin-appstream.c
+++ b/plugins/core/gs-plugin-appstream.c
@@ -593,6 +593,8 @@ gs_plugin_appstream_check_silo (GsPluginAppstream  *self,
                        if (!gs_appstream_load_desktop_files (builder, dir, cancellable, error))
                                return FALSE;
                }
+
+               gs_appstream_add_data_merge_fixup (builder, parent_appstream, parent_desktop, cancellable);
        }
 
        /* regenerate with each minor release */