[gnome-build-meta/mcatanzaro/libsoup3stuff: 1/2] Add librest-0.7 and webkit2gtk-4.1, and use for gnome-online-accounts

[Marge Bot <marge-bot src gnome org>]

commit 187d65f02a45e32156078e798ca820518924452c
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Thu Jun 16 13:57:36 2022 -0500

    Add librest-0.7 and webkit2gtk-4.1, and use for gnome-online-accounts
    
    gnome-online-accounts will now use libsoup 3. Yay!
    
    This also switches g-o-a to use meson, and drops its gtk-doc because
    screw that.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1625>

 elements/core-deps/gfbgraph.bst              |  2 +-
 elements/core-deps/gnome-online-accounts.bst | 13 ++++---------
 elements/core-deps/librest-0.7.bst           | 14 ++++++++++++++
 elements/core-deps/librest.bst               | 16 +++++++++++-----
 elements/core/gnome-builder.bst              |  1 +
 elements/core/gnome-initial-setup.bst        |  1 +
 elements/core/gnome-maps.bst                 |  1 +
 elements/sdk-platform.bst                    |  1 +
 elements/sdk/webkit2gtk-4.0.bst              |  1 -
 elements/sdk/webkit2gtk-4.1.bst              | 27 +++++++++++++++++++++++++++
 elements/world/libzapojit.bst                |  4 ++--
 11 files changed, 63 insertions(+), 18 deletions(-)
---
diff --git a/elements/core-deps/gfbgraph.bst b/elements/core-deps/gfbgraph.bst
index 4e6b3fabe..8e264cb92 100644
--- a/elements/core-deps/gfbgraph.bst
+++ b/elements/core-deps/gfbgraph.bst
@@ -8,7 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - core-deps/gnome-online-accounts.bst
-- core-deps/librest.bst
+- core-deps/librest-0.7.bst
 - sdk/glib.bst
 - sdk/json-glib.bst
 - sdk/libsoup-2.4.bst
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index 8faea13b6..8bdda8682 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -1,4 +1,4 @@
-kind: autotools
+kind: meson
 
 sources:
 - kind: git_tag
@@ -7,9 +7,8 @@ sources:
 
 build-depends:
 - sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
 - core-deps/librest.bst
@@ -17,10 +16,6 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - sdk/libsecret.bst
-- sdk/libsoup-2.4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/libsoup.bst
+- sdk/webkit2gtk-4.1.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-
-variables:
-  conf-local: >-
-    --enable-gtk-doc
diff --git a/elements/core-deps/librest-0.7.bst b/elements/core-deps/librest-0.7.bst
new file mode 100644
index 000000000..726f4ce31
--- /dev/null
+++ b/elements/core-deps/librest-0.7.bst
@@ -0,0 +1,14 @@
+kind: autotools
+sources:
+- kind: git_tag
+  url: gnome:librest.git
+  track: librest-0-7
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+depends:
+- sdk/glib.bst
+- sdk/libsoup-2.4.bst
+- freedesktop-sdk.bst:components/ca-certificates.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/librest.bst b/elements/core-deps/librest.bst
index 726f4ce31..15d8da62a 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -1,14 +1,20 @@
-kind: autotools
+kind: meson
 sources:
 - kind: git_tag
   url: gnome:librest.git
-  track: librest-0-7
+  track: master
 build-depends:
+- sdk-deps/gi-docgen.bst
 - sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
-- sdk/libsoup-2.4.bst
+- sdk/gtksourceview.bst
+- sdk/json-glib.bst
+- sdk/libadwaita.bst
+- sdk/libsoup.bst
 - freedesktop-sdk.bst:components/ca-certificates.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  meson-local: >-
+    -Dsoup2=false
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index 10bd078c5..5b6d2da8c 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -34,6 +34,7 @@ depends:
 - sdk/gtksourceview-4.bst
 - sdk/libhandy.bst
 - sdk/librsvg.bst
+- sdk/webkit2gtk-4.0.bst
 - freedesktop-sdk.bst:components/llvm.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index 4162ca64a..20f1e038f 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -18,6 +18,7 @@ depends:
 - core-deps/ibus-daemon.bst
 - core-deps/libgweather.bst
 - core-deps/libnma.bst
+- core-deps/librest-0.7.bst
 - core-deps/malcontent.bst
 - core-deps/upower.bst
 - core/cheese.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index bd1eccac9..220c1b027 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -10,6 +10,7 @@ depends:
 - core-deps/folks.bst
 - core-deps/geocode-glib.bst
 - core-deps/libchamplain.bst
+- core-deps/librest-0.7.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/geoclue.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 97aa2e35e..dcbe165dd 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -51,6 +51,7 @@ depends:
 - sdk/pygobject.bst
 - sdk/tracker.bst
 - sdk/webkit2gtk-4.0.bst
+- sdk/webkit2gtk-4.1.bst
 - sdk/webkit2gtk-5.0.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
diff --git a/elements/sdk/webkit2gtk-4.0.bst b/elements/sdk/webkit2gtk-4.0.bst
index 51d0b50ab..2ed9ca783 100644
--- a/elements/sdk/webkit2gtk-4.0.bst
+++ b/elements/sdk/webkit2gtk-4.0.bst
@@ -11,7 +11,6 @@ depends:
 variables:
   cmake-local: >-
     -DPORT=GTK
-    -DENABLE_GTKDOC=ON
     -DUSE_SOUP2=ON
     -DENABLE_WEBDRIVER=OFF
     %{webkitgtk_toolchain}
diff --git a/elements/sdk/webkit2gtk-4.1.bst b/elements/sdk/webkit2gtk-4.1.bst
new file mode 100644
index 000000000..f06ad115c
--- /dev/null
+++ b/elements/sdk/webkit2gtk-4.1.bst
@@ -0,0 +1,27 @@
+kind: cmake
+
+(@):
+  - elements/sdk/webkitgtk.inc
+
+depends:
+  (>):
+  - sdk/gtk+-3.bst
+  - sdk/libsoup.bst
+
+variables:
+  cmake-local: >-
+    -DPORT=GTK
+    -DENABLE_GTKDOC=ON
+    -DENABLE_WEBDRIVER=OFF
+    %{webkitgtk_toolchain}
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-4.1.so'
+        - '%{libdir}/libwebkit2gtk-4.1.so'
+      webkit-debug:
+      - '%{debugdir}'
+      - '%{debugdir}/**'
diff --git a/elements/world/libzapojit.bst b/elements/world/libzapojit.bst
index 4f9e0d92a..70137ccc3 100644
--- a/elements/world/libzapojit.bst
+++ b/elements/world/libzapojit.bst
@@ -7,7 +7,7 @@ sources:
 
 build-depends:
 - core-deps/intltool.bst
-- core-deps/librest.bst
+- core-deps/librest-0.7.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
@@ -17,5 +17,5 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - sdk/glib.bst
 - sdk/json-glib.bst
-- sdk/libsoup.bst
+- sdk/libsoup-2.4.bst
 - freedesktop-sdk.bst:bootstrap-import.bst