GNOME.org
 

[gnome-build-meta/mcatanzaro/webkitgtk-2.32.0-gnome-3-38: 1/2] Rename WebKitGTK.bst to webkitgtk.bst and update to 2.32.0


commit 65c6a4bd6a352828cc4b650c8d1b7962c60bc9d5
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Mar 29 15:34:05 2021 -0500

    Rename WebKitGTK.bst to webkitgtk.bst and update to 2.32.0
    
    This makes it possible to update WebKit via tarball conversion, as is
    already the case in master and GNOME 40.

 elements/core-deps/evolution-data-server.bst  | 2 +-
 elements/core-deps/gnome-online-accounts.bst  | 3 ++-
 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                     | 2 +-
 elements/sdk/{WebKitGTK.bst => webkitgtk.bst} | 5 +++--
 elements/sdk/yelp.bst                         | 2 +-
 elements/world/bijiben.bst                    | 2 +-
 elements/world/evolution.bst                  | 4 ++--
 elements/world/geary.bst                      | 2 +-
 elements/world/glade.bst                      | 2 +-
 elements/world/gnome-documents.bst            | 4 ++--
 elements/world/libgepub.bst                   | 4 ++--
 16 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 1bceb211..76890feb 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -15,12 +15,12 @@ depends:
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core-deps/openldap.bst
-- sdk/WebKitGTK.bst
 - sdk/gcr.bst
 - sdk/gtk+-3.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.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 d7ede803..d28963b6 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -9,11 +9,12 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - core-deps/librest.bst
-- sdk/WebKitGTK.bst
+- sdk/gcr.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index b2c74eb2..63ed9e16 100644
--- a/elements/core/devhelp.bst
+++ b/elements/core/devhelp.bst
@@ -7,9 +7,9 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/amtk.bst
-- sdk/WebKitGTK.bst
 - sdk/appstream-glib.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gtk+-3.bst
 - sdk/gtk-doc.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index e162d5f9..f9469a18 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -8,7 +8,6 @@ build-depends:
 depends:
 - core-deps/libdazzle.bst
 - core-deps/libhandy.bst
-- sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/gcr.bst
@@ -20,6 +19,7 @@ depends:
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/iso-codes.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/libportal.bst
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index 9f13e1cf..e42a1719 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -21,12 +21,12 @@ depends:
 - core-deps/tracker-2.bst
 - core-deps/tracker-miners-2.bst
 - core-deps/vte.bst
-- sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
 - sdk/json-glib.bst
 - sdk/libsecret.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 aaf8a490..ce6c8cf5 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -22,11 +22,11 @@ depends:
 - core/gnome-desktop.bst
 - core/gnome-getting-started-docs.bst
 - core/gnome-keyring.bst
-- sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/geoclue.bst
 - sdk/glib.bst
 - sdk/gtk+-3.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 05d504e3..94625b45 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -8,7 +8,6 @@ build-depends:
 depends:
 - core-deps/libmusicbrainz.bst
 - core/evince.bst
-- sdk/WebKitGTK.bst
 - sdk/clutter-gst.bst
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
@@ -17,5 +16,6 @@ depends:
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.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 8f4eec4f..90fa500d 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -1,6 +1,5 @@
 kind: stack
 depends:
-- sdk/WebKitGTK.bst
 - sdk/adobe-source-code-pro-fonts.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
@@ -46,6 +45,7 @@ depends:
 - sdk/pipewire-libjack.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
+- sdk/webkitgtk.bst
 - sdk/woff2.bst
 - sdk/wpebackend-fdo.bst
 - sdk/yelp-xsl.bst
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/webkitgtk.bst
similarity index 93%
rename from elements/sdk/WebKitGTK.bst
rename to elements/sdk/webkitgtk.bst
index 6ed0bf14..3a6ff371 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/webkitgtk.bst
@@ -2,8 +2,8 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: webkitgtk_org:webkitgtk-2.30.4.tar.xz
-  ref: d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24
+  url: webkitgtk_org:webkitgtk-2.32.0.tar.xz
+  ref: 9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
@@ -60,6 +60,7 @@ variables:
         -DENABLE_GLES2=ON
   cmake-local: >-
     -DPORT=GTK
+    -DENABLE_GAMEPAD=OFF
     %{webkitgtk_toolchain}
     %{webkitgtk_arch_options}
 (?):
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
index 1f02c908..b4faa250 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -7,11 +7,11 @@ build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
+- sdk/webkitgtk.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 ac55dda0..e2b798a4 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -14,11 +14,11 @@ build-depends:
 depends:
 - core-deps/evolution-data-server.bst
 - core-deps/libhandy-0.bst
-- sdk/WebKitGTK.bst
 - sdk/appstream-glib.bst
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/tracker.bst
+- sdk/webkitgtk.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 86dc9ee6..441750a0 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -5,8 +5,8 @@ sources:
   track: master
 
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 - core-deps/intltool.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 
 depends:
 - core-deps/evolution-data-server.bst
@@ -17,7 +17,6 @@ depends:
 - core-deps/libgdata.bst
 - core-deps/libgweather.bst
 - core/gnome-desktop.bst
-- sdk/WebKitGTK.bst
 - sdk/atk.bst
 - sdk/gcr.bst
 - sdk/gdk-pixbuf.bst
@@ -27,6 +26,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsoup.bst
+- sdk/webkitgtk.bst
 - sdk/yelp-tools.bst
 - world/gtkspell.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
diff --git a/elements/world/geary.bst b/elements/world/geary.bst
index 9aaa2c18..e366e530 100644
--- a/elements/world/geary.bst
+++ b/elements/world/geary.bst
@@ -28,7 +28,7 @@ depends:
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/vala.bst
-- sdk/WebKitGTK.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 cf9ea172..b0c751ca 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -10,7 +10,7 @@ runtime-depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/cantarell-fonts.bst
 depends:
-- sdk/WebKitGTK.bst
 - sdk/gjs.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
+- sdk/webkitgtk.bst
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 6b327afe..4997c6cc 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -15,16 +15,16 @@ depends:
 - core-deps/gnome-online-accounts.bst
 - core-deps/gnome-online-miners.bst
 - core-deps/libgdata.bst
-- core-deps/tracker-miners-2.bst
 - core-deps/tracker-2.bst
+- core-deps/tracker-miners-2.bst
 - core/evince.bst
 - core/gnome-desktop.bst
-- sdk/WebKitGTK.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/gjs.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
+- sdk/webkitgtk.bst
 - world/libgepub.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/libgepub.bst b/elements/world/libgepub.bst
index 1342b587..eacdb34b 100644
--- a/elements/world/libgepub.bst
+++ b/elements/world/libgepub.bst
@@ -6,8 +6,8 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- sdk/WebKitGTK.bst
 - sdk/glib.bst
 - sdk/libsoup.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
+- sdk/webkitgtk.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]