[jhbuild] gnome-suites-core: Use libappstream for gnome-software

[Emmanuele Bassi <ebassi src gnome org>]

commit 2e9c59a3c9750b8deb344c8a4457d0700dee1d31
Author: Philip Withnall <pwithnall endlessos org>
Date:   Mon May 17 13:38:33 2021 +0100

    gnome-suites-core: Use libappstream for gnome-software
    
    Rather than appstream-glib. It was ported for GNOME 40.
    
    Add the build instructions for appstream and its dependencies too.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 modulesets/gnome-suites-core-deps-latest.modules | 13 +++++++++++++
 modulesets/gnome-suites-core-latest.modules      |  2 +-
 modulesets/gnome-sysdeps-latest.modules          | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 1f5adf47..946e5b6b 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -78,6 +78,19 @@
     </dependencies>
   </meson>
 
+  <meson id="appstream" mesonargs="-Dstemming=false -Dvapi=true">
+    <branch repo="github.com" checkoutdir="appstream" module="ximion/appstream.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libcurl"/>
+      <dep package="libxml2"/>
+      <dep package="libyaml"/>
+      <dep package="lmdb"/>
+      <dep package="vala"/>
+    </dependencies>
+  </meson>
+
   <meson id="appstream-glib" mesonargs="-Dstemmer=false -Drpm=false">
     <branch repo="github.com" checkoutdir="appstream-glib" module="hughsie/appstream-glib.git"/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index d2d703c8..e7aa46f0 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -1047,7 +1047,7 @@
     </if>
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
+      <dep package="appstream"/>
       <dep package="glib"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gspell"/>
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 9d0af442..4cf6fdab 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -690,6 +690,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libcurl">
+    <pkg-config>libcurl.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libdb">
     <branch repo="system"/>
     <systemdependencies>
@@ -979,6 +984,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="lmdb">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="lmdb.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="mesa-libGLES">
     <pkg-config>glesv2.pc</pkg-config>
     <branch repo="system"