[jhbuild/wip/hadess/librest-fixes] core-deps-latest: Fix librest branch

[Bastien Nocera <hadess src gnome org>]

commit bc979a3f8c9cba02bb120a9d6fdf25399447f524
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Mar 28 17:38:22 2022 +0200

    core-deps-latest: Fix librest branch
    
    89a9b6e7 switched the build system to meson, but didn't remove the
    branch, so the module wanted to build using meson in an autotools-only
    branch.
    
    As the API and ABI changed, add a librest-0.7 module.
    
    Fixes: 89a9b6e7
    
    Closes: #284

 modulesets/gnome-suites-core-deps-latest.modules | 26 ++++++++++++++++++------
 modulesets/gnome-world.modules                   |  6 +++---
 2 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 0dbf55b4..0fbc28f2 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -647,7 +647,7 @@
     <dependencies>
       <dep package="gtk+-3"/>
       <dep package="WebKit"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="libsoup"/>
       <dep package="libsecret"/>
       <dep package="json-glib"/>
@@ -768,7 +768,7 @@
       <dep package="libgdata"/>
       <dep package="libmediaart"/>
       <dep package="liboauth"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="libsoup"/>
       <dep package="sqlite3"/>
       <dep package="tracker"/>
@@ -1332,7 +1332,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="libsoup"/>
       <dep package="gnome-online-accounts"/>
     </dependencies>
@@ -1341,7 +1341,7 @@
   <autotools id="libgovirt">
     <branch/>
     <dependencies>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
@@ -1609,7 +1609,6 @@
     <if condition-set="macos">
       <mesonargs value="-Dca_certificates=false"/>
     </if>
-    <branch revision="librest-0-7"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -1617,6 +1616,21 @@
     </dependencies>
   </meson>
 
+  <autotools id="librest-0.7">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-ca-certificates"/>
+    </if>
+    <branch revision="librest-0-7"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--enable-vala=yes">
     <if condition-unset="gnu-elf">
       <autogenargs value="--disable-Bsymbolic"/>
@@ -1757,7 +1771,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="libsoup"/>
       <dep package="gnome-online-accounts"/>
     </dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 81df74ed..d25abb94 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -190,7 +190,7 @@
       <dep package="vala"/>
       <dep package="WebKit"/>
       <dep package="sqlite3"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="libnotify"/>
     </dependencies>
   </meson>
@@ -234,7 +234,7 @@
       <dep package="intltool"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
       <dep package="librsvg"/>
       <dep package="libsoup"/>
       <dep package="sqlite3"/>
@@ -1870,7 +1870,7 @@
       <dep package="gtk+-3"/>
       <dep package="libchamplain"/>
       <dep package="libpeas"/>
-      <dep package="librest"/>
+      <dep package="librest-0.7"/>
     </dependencies>
   </autotools>