GNOME.org
 

[gnome-build-meta/abderrahim/webkit-gtk4] sdk/webkitgtk.bst: build gtk4 variant


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

    sdk/webkitgtk.bst: build gtk4 variant
    
    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                   |  2 +-
 elements/core/gnome-boxes.bst                |  2 +-
 elements/core/gnome-initial-setup.bst        |  2 +-
 elements/core/sushi.bst                      |  2 +-
 elements/sdk-platform.bst                    |  1 +
 elements/sdk/webkitgtk.bst                   |  8 +--
 elements/sdk/webkitgtk4.bst                  | 83 ++++++++++++++++++++++++++++
 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 +-
 17 files changed, 102 insertions(+), 18 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index e6e1614da..6b1d67e71 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/webkitgtk4.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..b5a09f576 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/webkitgtk4.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index 4778b7370..46e1dcdb9 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/webkitgtk4.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 04d2aa977..ca25c4a51 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -20,7 +20,7 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup-2.4.bst
-- sdk/webkitgtk.bst
+- sdk/webkitgtk4.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..988169d11 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/webkitgtk4.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..01a6ae280 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/webkitgtk4.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..b25487ae7 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/webkitgtk4.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..4ef265680 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -55,6 +55,7 @@ depends:
 - sdk/pipewire.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
+- sdk/webkitgtk4.bst
 - sdk/webkitgtk.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.bst
index faf2d6953..d78995df1 100644
--- a/elements/sdk/webkitgtk.bst
+++ b/elements/sdk/webkitgtk.bst
@@ -28,11 +28,11 @@ depends:
 - sdk/enchant-2.bst
 - sdk/geoclue.bst
 - sdk/gst-plugins-base.bst
-- sdk/gtk+-3.bst
+- sdk/gtk.bst
 - sdk/libmanette.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
-- sdk/libsoup-2.4.bst
+- sdk/libsoup.bst
 - sdk/libwpe.bst
 - sdk/pango.bst
 - sdk/woff2.bst
@@ -59,8 +59,8 @@ variables:
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
   cmake-local: >-
     -DPORT=GTK
-    -DENABLE_GTKDOC=ON
-    -DUSE_SOUP2=ON
+    #-DENABLE_GTKDOC=ON
+    -DUSE_GTK4=ON
     %{webkitgtk_toolchain}
     %{webkitgtk_arch_options}
 (?):
diff --git a/elements/sdk/webkitgtk4.bst b/elements/sdk/webkitgtk4.bst
new file mode 100644
index 000000000..faf2d6953
--- /dev/null
+++ b/elements/sdk/webkitgtk4.bst
@@ -0,0 +1,83 @@
+kind: cmake
+
+sources:
+- kind: tar
+  url: webkitgtk_org:webkitgtk-2.34.0.tar.xz
+- kind: local
+  path: files/webkitgtk/toolchain.i686
+- kind: local
+  path: files/webkitgtk/toolchain.arm
+
+build-depends:
+- sdk-deps/bubblewrap.bst
+- sdk-deps/xdg-dbus-proxy.bst
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:components/gperf.bst
+- freedesktop-sdk.bst:components/perl.bst
+- freedesktop-sdk.bst:components/ruby.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
+
+runtime-depends:
+- sdk/gst-libav.bst
+- sdk/gst-plugins-bad.bst
+- sdk/gst-plugins-good.bst
+
+depends:
+- sdk/at-spi2-core.bst
+- 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
+- sdk/wpebackend-fdo.bst
+- freedesktop-sdk.bst:components/brotli.bst
+- freedesktop-sdk.bst:components/hyphen.bst
+- freedesktop-sdk.bst:components/lcms.bst
+- freedesktop-sdk.bst:components/libseccomp.bst
+- freedesktop-sdk.bst:components/libtasn1.bst
+- freedesktop-sdk.bst:components/libwebp.bst
+- freedesktop-sdk.bst:components/libxslt.bst
+- freedesktop-sdk.bst:components/openjpeg.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
+- freedesktop-sdk.bst:components/wayland.bst
+- freedesktop-sdk.bst:components/xorg-lib-xt.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  optimize-debug: 'false'
+  webkitgtk_toolchain: ''
+  webkitgtk_arch_options: ''
+  (?):
+  - 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}
+    %{webkitgtk_arch_options}
+(?):
+- arch == "i686":
+    environment:
+      CFLAGS: '%{flags_i686} -g1'
+      CXXFLAGS: '%{flags_i686} -g1'
+- arch == "arm":
+    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 84a1d2083..06e6783d3 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/webkitgtk4.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 9d1217177..9273c2e67 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/webkitgtk4.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..47b1b1b5b 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/webkitgtk4.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..3f6f8bb40 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/webkitgtk4.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..8daab03ca 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/webkitgtk4.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index e009fd450..db88dac4e 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/webkitgtk4.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..577386eb5 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/webkitgtk4.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]