[gnome-software/wip/mak/libas: 5/12] meson: Adjust dependency for AppStream, replacing appstream-glib

[Matthias Klumpp <mak src gnome org>]

commit 9ccb1c1710f763dec4895983887999bbb5354f60
Author: Matthias Klumpp <matthias tenstral net>
Date:   Wed Jan 6 18:45:44 2021 +0100

    meson: Adjust dependency for AppStream, replacing appstream-glib

 contrib/gnome-software.spec.in         | 6 +++---
 lib/meson.build                        | 6 +++---
 meson.build                            | 2 +-
 plugins/dummy/meson.build              | 2 +-
 plugins/external-appstream/meson.build | 2 +-
 plugins/meson.build                    | 2 +-
 src/meson.build                        | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 62a01fdb2..84fcef109 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -2,7 +2,7 @@
 %global gtk3_version 3.22.4
 %global json_glib_version 1.2.0
 %global packagekit_version 1.1.1
-%global appstream_glib_version 0.7.15
+%global appstream_version 0.14.0
 %global libsoup_version 2.52.0
 %global gsettings_desktop_schemas_version 3.12.0
 %global fwupd_version 1.2.10
@@ -33,7 +33,7 @@ BuildRequires: gspell-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk-doc
 BuildRequires: json-glib-devel >= %{json_glib_version}
-BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
+BuildRequires: libappstream-devel >= %{appstream_version}
 BuildRequires: libdnf-devel
 BuildRequires: libsoup-devel
 BuildRequires: libxmlb-devel >= %{libxmlb_version}
@@ -58,7 +58,7 @@ Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_versi
 Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: json-glib%{?_isa} >= %{json_glib_version}
 Requires: iso-codes
-Requires: libappstream-glib%{?_isa} >= %{appstream_glib_version}
+Requires: libappstream%{?_isa} >= %{appstream_version}
 # librsvg2 is needed for gdk-pixbuf svg loader
 Requires: librsvg2%{?_isa}
 Requires: libsoup%{?_isa} >= %{libsoup_version}
diff --git a/lib/meson.build b/lib/meson.build
index 0ef493675..8b697b68d 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -24,7 +24,7 @@ install_headers([
 )
 
 librarydeps = [
-  appstream_glib,
+  appstream,
   gio_unix,
   glib,
   gmodule,
@@ -92,7 +92,7 @@ executable(
     include_directories('..'),
   ],
   dependencies : [
-    appstream_glib,
+    appstream,
     gio_unix,
     glib,
     gmodule,
@@ -123,7 +123,7 @@ if get_option('tests')
       include_directories('..'),
     ],
     dependencies : [
-      appstream_glib,
+      appstream,
       gio_unix,
       glib,
       gmodule,
diff --git a/meson.build b/meson.build
index ccbd09bc6..fcf80f8c4 100644
--- a/meson.build
+++ b/meson.build
@@ -98,7 +98,7 @@ add_project_arguments('-D_GNU_SOURCE', language : 'c')
 
 conf.set('HAVE_LINUX_UNISTD_H', cc.has_header('linux/unistd.h'))
 
-appstream_glib = dependency('appstream-glib', version : '>= 0.7.14')
+appstream = dependency('appstream', version : '>= 0.14.0', fallback : ['appstream', 'appstream_dep'])
 gdk_pixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.32.0')
 libxmlb = dependency('xmlb', version : '>= 0.1.7', fallback : ['libxmlb', 'libxmlb_dep'])
 gio_unix = dependency('gio-unix-2.0', version : '>= 2.56.0')
diff --git a/plugins/dummy/meson.build b/plugins/dummy/meson.build
index 9235f4ef9..2aa592bf2 100644
--- a/plugins/dummy/meson.build
+++ b/plugins/dummy/meson.build
@@ -12,7 +12,7 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [appstream_glib, gio_unix, goa, gtk, libsoup],
+  dependencies : [appstream, gio_unix, goa, gtk, libsoup],
   link_with : [
     libgnomesoftware
   ]
diff --git a/plugins/external-appstream/meson.build b/plugins/external-appstream/meson.build
index 2252c7d57..c00052bec 100644
--- a/plugins/external-appstream/meson.build
+++ b/plugins/external-appstream/meson.build
@@ -31,7 +31,7 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [gio_unix, appstream_glib, libsoup, plugin_libs],
+  dependencies : [gio_unix, appstream, libsoup, plugin_libs],
   link_with : [
     libgnomesoftware
   ]
diff --git a/plugins/meson.build b/plugins/meson.build
index d749b3df6..bd1606f13 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,6 +1,6 @@
 plugin_dir = join_paths(get_option('libdir'), 'gs-plugins-' + gs_plugin_api_version)
 plugin_libs = [
-  appstream_glib,
+  appstream,
   gio_unix,
   goa,
   gtk,
diff --git a/src/meson.build b/src/meson.build
index 2f9ff2348..fde5fbdc5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -71,7 +71,7 @@ gnome_software_sources = [
 ]
 
 gnome_software_dependencies = [
-  appstream_glib,
+  appstream,
   gio_unix,
   glib,
   gmodule,
@@ -238,7 +238,7 @@ if get_option('tests')
       include_directories('../lib'),
     ],
     dependencies : [
-      appstream_glib,
+      appstream,
       gio_unix,
       glib,
       gmodule,