[gnome-build-meta/abderrahim/webkit-soup2: 2/2] sdk/webkitgtk.bst: build only libsoup2 variant

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

commit e175435456c6e90e7cb7f2996ff24aa140317922
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Jul 26 19:45:37 2021 +0100

    sdk/webkitgtk.bst: build only libsoup2 variant
    
    See https://discourse.gnome.org/t/webkit2gtk-4-1-added-to-gnome-sdk-webkit2gtk-4-0-deprecated/7053
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1245>

 elements/core-deps/evolution-data-server.bst  |  2 +-
 elements/core-deps/gnome-online-accounts.bst  |  2 +-
 elements/core/devhelp.bst                     |  2 +-
 elements/core/epiphany.bst                    |  7 +++++--
 elements/core/gnome-boxes.bst                 |  2 +-
 elements/core/gnome-initial-setup.bst         |  2 +-
 elements/core/sushi.bst                       |  2 +-
 elements/sdk-platform.bst                     |  3 +--
 elements/sdk/webkit2gtk-4.0.bst               | 22 ----------------------
 elements/sdk/webkit2gtk-4.1.bst               | 22 ----------------------
 elements/sdk/{webkitgtk.inc => webkitgtk.bst} | 14 +++++++++++++-
 elements/sdk/yelp.bst                         |  5 ++++-
 elements/world/bijiben.bst                    |  2 +-
 elements/world/evolution.bst                  |  2 +-
 elements/world/geary.bst                      |  2 +-
 elements/world/glade.bst                      |  2 +-
 elements/world/gnome-documents.bst            |  2 +-
 elements/world/libgepub.bst                   |  2 +-
 18 files changed, 35 insertions(+), 62 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index fa6292c3..e6e1614d 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -21,7 +21,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/libical.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index 72ee76e9..7fff2ae0 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -18,7 +18,7 @@ depends:
 - sdk/json-glib.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index 3140e9b6..4778b737 100644
--- a/elements/core/devhelp.bst
+++ b/elements/core/devhelp.bst
@@ -15,5 +15,5 @@ build-depends:
 depends:
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index adc100ce..04d2aa97 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -19,8 +19,11 @@ depends:
 - sdk/libhandy.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- sdk/libsoup.bst
-- sdk/webkit2gtk-4.1.bst
+- sdk/libsoup-2.4.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:components/libportal.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  meson-local: >-
+    -Dsoup2=enabled
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index cab98a66..9e5be114 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -36,6 +36,6 @@ depends:
 - sdk/libhandy.bst
 - sdk/libsecret.bst
 - sdk/tracker.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index d008e407..bcd97752 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -25,7 +25,7 @@ depends:
 - sdk/geoclue.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/pwquality.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 802d63d3..456fb794 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -12,6 +12,6 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview-4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 795f2e43..f4c44b02 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -49,8 +49,7 @@ depends:
 - sdk/pipewire.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
-- sdk/webkit2gtk-4.0.bst
-- sdk/webkit2gtk-4.1.bst
+- sdk/webkitgtk.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
 - sdk/yelp-xsl.bst
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.bst
similarity index 85%
rename from elements/sdk/webkitgtk.inc
rename to elements/sdk/webkitgtk.bst
index a8a7bfd3..adf65fa2 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.bst
@@ -1,3 +1,5 @@
+kind: cmake
+
 sources:
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.33.2.tar.xz
@@ -29,6 +31,7 @@ depends:
 - sdk/libmanette.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
+- sdk/libsoup-2.4.bst
 - sdk/libwpe.bst
 - sdk/pango.bst
 - sdk/woff2.bst
@@ -53,6 +56,10 @@ variables:
   (?):
   - arch == "i686" or arch == "arm":
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
+  cmake-local: >-
+    -DPORT=GTK -DENABLE_WEBDRIVER=OFF -DUSE_SOUP2=ON
+    %{webkitgtk_toolchain}
+    %{webkitgtk_arch_options}
 (?):
 - arch == "i686":
     environment:
@@ -62,7 +69,12 @@ variables:
     environment:
       CFLAGS: '%{flags_arm} -g1'
       CXXFLAGS: '%{flags_arm} -g1'
-
 public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-4.0.so'
+        - '%{libdir}/libwebkit2gtk-4.0.so'
   cpe:
     product: webkitgtk+
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
index 0d0631b0..84a1d208 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -12,10 +12,13 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
-- sdk/webkit2gtk-4.1.bst
+- sdk/webkitgtk.bst
 - sdk/yelp-xsl.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  conf-local: >-
+    --with-webkit2gtk-4-0
 public:
   bst:
     integration-commands:
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index e6f5cc10..9d121717 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -20,6 +20,6 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
 - sdk/tracker.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - world/libhandy-0.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 920f4448..035ec688 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -27,7 +27,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - world/gtkspell.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/geary.bst b/elements/world/geary.bst
index 30cd6a71..cec5ccec 100644
--- a/elements/world/geary.bst
+++ b/elements/world/geary.bst
@@ -27,7 +27,7 @@ depends:
 - sdk/libgee.bst
 - sdk/libhandy.bst
 - sdk/libsecret.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:components/sqlite.bst
diff --git a/elements/world/glade.bst b/elements/world/glade.bst
index 99a3ee3b..f3e3cf8f 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -18,4 +18,4 @@ depends:
 - sdk/gjs.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 48d50f4f..e009fd45 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -28,7 +28,7 @@ depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - world/libgepub.bst
 - world/libzapojit.bst
 - world/tracker-2.bst
diff --git a/elements/world/libgepub.bst b/elements/world/libgepub.bst
index 59de0835..6b4faba2 100644
--- a/elements/world/libgepub.bst
+++ b/elements/world/libgepub.bst
@@ -9,6 +9,6 @@ build-depends:
 depends:
 - sdk/glib.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkit2gtk-4.0.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/libarchive.bst
 - freedesktop-sdk.bst:bootstrap-import.bst