GNOME.org
 

[gnome-build-meta/mcatanzaro/webkit2gtk-4.1: 1/2] Build separate webkit2gtk-4.0 and webkit2gtk-4.1 elements...


commit f6fdcdf5f8ec1db13d853234670ddc0aeae4ae03
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Jun 7 16:58:30 2021 -0500

    Build separate webkit2gtk-4.0 and webkit2gtk-4.1 elements...
    
    ...and switch Epiphany to use webkit2gtk-4.1.
    
    The difference is that -4.0 uses libsoup2 while -4.1 uses libsoup3.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1170>

 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              | 23 +++++++++++++++++++++++
 elements/sdk/webkit2gtk-4.1.bst              | 23 +++++++++++++++++++++++
 elements/sdk/webkitgtk.bst                   | 15 +--------------
 elements/sdk/yelp.bst                        |  2 +-
 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, 64 insertions(+), 33 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index e6e1614d..fa6292c3 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 17650870..200db77c 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -18,7 +18,7 @@ depends:
 - sdk/librest.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index 8e61a9cb..8b0e3d95 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 04d2aa97..adc100ce 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -19,11 +19,8 @@ depends:
 - sdk/libhandy.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- sdk/libsoup-2.4.bst
-- sdk/webkitgtk.bst
+- sdk/libsoup.bst
+- sdk/webkit2gtk-4.1.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 37ca2dcd..15851ba8 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 bcd97752..d008e407 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 24d364e7..ca41fe00 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -16,6 +16,6 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 e1bd72cd..cec99f42 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -44,7 +44,8 @@ depends:
 - sdk/pipewire.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
+- sdk/webkit2gtk-4.1.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
 - sdk/yelp-xsl.bst
diff --git a/elements/sdk/webkit2gtk-4.0.bst b/elements/sdk/webkit2gtk-4.0.bst
new file mode 100644
index 00000000..da24e039
--- /dev/null
+++ b/elements/sdk/webkit2gtk-4.0.bst
@@ -0,0 +1,23 @@
+kind: cmake
+
+(@):
+  - elements/sdk/webkitgtk.bst
+
+depends:
+  (>):
+  - sdk/libsoup-2.4.bst
+
+variables:
+  # FIXME: Enable gamepad support via libmanette once freedesktop-sdk's gudev is built with 
gobject-introspection support
+  cmake-local: >-
+    -DPORT=GTK -DENABLE_GAMEPAD=OFF -DENABLE_WEBDRIVER=OFF -DUSE_SOUP2=ON
+    %{webkitgtk_toolchain}
+    %{webkitgtk_arch_options}
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-4.0.so'
+        - '%{libdir}/libwebkit2gtk-4.0.so'
diff --git a/elements/sdk/webkit2gtk-4.1.bst b/elements/sdk/webkit2gtk-4.1.bst
new file mode 100644
index 00000000..9802b529
--- /dev/null
+++ b/elements/sdk/webkit2gtk-4.1.bst
@@ -0,0 +1,23 @@
+kind: cmake
+
+(@):
+  - elements/sdk/webkitgtk.bst
+
+depends:
+  (>):
+  - sdk/libsoup.bst
+
+variables:
+  # FIXME: Enable gamepad support via libmanette once freedesktop-sdk's gudev is built with 
gobject-introspection support
+  cmake-local: >-
+    -DPORT=GTK -DENABLE_GAMEPAD=OFF
+    %{webkitgtk_toolchain}
+    %{webkitgtk_arch_options}
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-4.1.so'
+        - '%{libdir}/libwebkit2gtk-4.1.so'
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.bst
index da7f91d5..1ee25ce0 100644
--- a/elements/sdk/webkitgtk.bst
+++ b/elements/sdk/webkitgtk.bst
@@ -1,5 +1,3 @@
-kind: cmake
-
 sources:
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.33.1.tar.xz
@@ -34,7 +32,6 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- sdk/libsoup-2.4.bst
 - sdk/libwpe.bst
 - sdk/pango.bst
 - sdk/woff2.bst
@@ -59,11 +56,6 @@ variables:
   (?):
   - arch == "i686" or arch == "arm":
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
-  # FIXME: Enable gamepad support via libmanette once freedesktop-sdk's gudev is built with 
gobject-introspection support
-  cmake-local: >-
-    -DPORT=GTK -DENABLE_GAMEPAD=OFF -DUSE_SOUP2=ON
-    %{webkitgtk_toolchain}
-    %{webkitgtk_arch_options}
 (?):
 - arch == "i686":
     environment:
@@ -73,12 +65,7 @@ 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 0f4a5840..d03606fd 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -12,7 +12,7 @@ depends:
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - sdk/yelp-xsl.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index cf315dc9..ea0ac4f3 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - world/libhandy-0.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 035ec688..920f4448 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 cec5ccec..30cd6a71 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.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 f3e3cf8f..99a3ee3b 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index e009fd45..48d50f4f 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - world/libgepub.bst
 - world/libzapojit.bst
 - world/tracker-2.bst
diff --git a/elements/world/libgepub.bst b/elements/world/libgepub.bst
index 6b4faba2..59de0835 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/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - freedesktop-sdk.bst:components/libarchive.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]