GNOME.org
 

[gnome-build-meta/abderrahim/webkit-gtk4: 2/2] sdk/webkit2gtk-5.0.bst: build gtk4 variant of webkit


commit bd4161c2689d9b0b68fbcdea628c0deabf195cbe
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Oct 3 16:08:33 2021 +0100

    sdk/webkit2gtk-5.0.bst: build gtk4 variant of webkit
    
    Fixes #429

 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                    |  5 ++++-
 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               | 25 +++++++++++++++++++++++++
 elements/sdk/webkit2gtk-5.0.bst               | 24 ++++++++++++++++++++++++
 elements/sdk/{webkitgtk.bst => webkitgtk.inc} | 15 ---------------
 elements/sdk/yelp.bst                         |  7 ++++++-
 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, 73 insertions(+), 30 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index e6e1614da..fa6292c39 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 cb38f7493..eb19148ac 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/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 4778b7370..3140e9b65 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 04d2aa977..13144ac11 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -1,12 +1,15 @@
 kind: meson
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/epiphany.git
   track: master
+
 build-depends:
 - sdk/appstream-glib.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - core-deps/libdazzle.bst
 - sdk/adwaita-icon-theme.bst
@@ -20,7 +23,7 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:components/libportal.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 9e5be114b..cab98a661 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 bcd977527..d008e4077 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 e0d7177ed..8362a9917 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -13,6 +13,6 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview-4.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 2059f2962..1deedffc8 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -55,7 +55,8 @@ depends:
 - sdk/pipewire.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
-- sdk/webkitgtk.bst
+- sdk/webkit2gtk-4.0.bst
+- sdk/webkit2gtk-5.0.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 000000000..ed1a28104
--- /dev/null
+++ b/elements/sdk/webkit2gtk-4.0.bst
@@ -0,0 +1,25 @@
+kind: cmake
+
+(@):
+  - elements/sdk/webkitgtk.inc
+
+depends:
+  (>):
+  - sdk/libsoup-2.4.bst
+  - sdk/gtk+-3.bst
+
+variables:
+  cmake-local: >-
+    -DPORT=GTK
+    -DENABLE_GTKDOC=ON
+    -DUSE_SOUP2=ON
+    -DENABLE_WEBDRIVER=OFF
+    %{webkitgtk_toolchain}
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-4.0.so'
+        - '%{libdir}/libwebkit2gtk-4.0.so'
diff --git a/elements/sdk/webkit2gtk-5.0.bst b/elements/sdk/webkit2gtk-5.0.bst
new file mode 100644
index 000000000..f6ebc02d9
--- /dev/null
+++ b/elements/sdk/webkit2gtk-5.0.bst
@@ -0,0 +1,24 @@
+kind: cmake
+
+(@):
+  - elements/sdk/webkitgtk.inc
+
+depends:
+  (>):
+  - sdk/gtk.bst
+  - sdk/libsoup.bst
+
+variables:
+  cmake-local: >-
+    -DPORT=GTK
+    -DUSE_GTK4=ON
+    # -DENABLE_GTKDOC=ON doesn't work right now
+    %{webkitgtk_toolchain}
+
+public:
+  bst:
+    split-rules:
+      devel:
+        (>):
+        - '%{libdir}/libjavascriptcoregtk-5.0.so'
+        - '%{libdir}/libwebkit2gtk-5.0.so'
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.inc
similarity index 85%
rename from elements/sdk/webkitgtk.bst
rename to elements/sdk/webkitgtk.inc
index f225dbdfa..cd94b1b85 100644
--- a/elements/sdk/webkitgtk.bst
+++ b/elements/sdk/webkitgtk.inc
@@ -1,5 +1,3 @@
-kind: cmake
-
 sources:
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.34.1.tar.xz
@@ -28,11 +26,9 @@ depends:
 - sdk/enchant-2.bst
 - sdk/geoclue.bst
 - sdk/gst-plugins-base.bst
-- sdk/gtk+-3.bst
 - sdk/libmanette.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- sdk/libsoup-2.4.bst
 - sdk/libwpe.bst
 - sdk/pango.bst
 - sdk/woff2.bst
@@ -56,11 +52,6 @@ variables:
   (?):
   - arch == "i686" or arch == "arm":
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
-  cmake-local: >-
-    -DPORT=GTK
-    -DENABLE_GTKDOC=ON
-    -DUSE_SOUP2=ON
-    %{webkitgtk_toolchain}
 
 (?):
 - arch == "i686":
@@ -73,11 +64,5 @@ variables:
       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 84a1d2083..cd1ef7897 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -1,24 +1,29 @@
 kind: autotools
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/yelp.git
   track: master
+
 build-depends:
 - sdk/appstream-glib.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - sdk/adwaita-icon-theme.bst
 - 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
+
 variables:
   conf-local: >-
     --with-webkit2gtk-4-0
+
 public:
   bst:
     integration-commands:
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index 9d1217177..e6f5cc109 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 035ec6883..920f44488 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 cec5ccec8..30cd6a714 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 f3e3cf8f0..99a3ee3b9 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 e009fd450..48d50f4f6 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 6b4faba24..59de08359 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]