From dc9a8645bdf9b5931e3291f8b2076b4640b5c59a513d363129d49c16cfecdf01 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 23 Mar 2021 10:15:45 +0000 Subject: [PATCH 1/2] Accepting request 880431 from home:mgorse:branches:GNOME:Factory - Update to version 2.30.6: OBS-URL: https://build.opensuse.org/request/show/880431 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=297 --- webkit2gtk3.changes | 7 +++++++ webkit2gtk3.spec | 4 ++-- webkitgtk-2.30.5.tar.xz | 3 --- webkitgtk-2.30.5.tar.xz.asc | 6 ------ webkitgtk-2.30.6.tar.xz | 3 +++ webkitgtk-2.30.6.tar.xz.asc | 6 ++++++ 6 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 webkitgtk-2.30.5.tar.xz delete mode 100644 webkitgtk-2.30.5.tar.xz.asc create mode 100644 webkitgtk-2.30.6.tar.xz create mode 100644 webkitgtk-2.30.6.tar.xz.asc diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 4334a72..21adde9 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 21 20:33:09 UTC 2021 - Michael Gorse + +- Update to version 2.30.6: + + Update user agent quirks again for Google Docs and Google Drive. + + Fix several crashes and rendering issues. + ------------------------------------------------------------------- Fri Feb 19 07:45:12 UTC 2021 - Guillaume GARDET diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index c2451c2..042ab34 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -31,10 +31,10 @@ %define _gold_linker 0 %endif Name: webkit2gtk3 -Version: 2.30.5 +Version: 2.30.6 Release: 0 Summary: Library for rendering web content, GTK+ Port -License: LGPL-2.0-or-later AND BSD-3-Clause +License: BSD-3-Clause AND LGPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://webkitgtk.org Source0: %{url}/releases/%{_name}-%{version}.tar.xz diff --git a/webkitgtk-2.30.5.tar.xz b/webkitgtk-2.30.5.tar.xz deleted file mode 100644 index 88c5b85..0000000 --- a/webkitgtk-2.30.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f -size 22311832 diff --git a/webkitgtk-2.30.5.tar.xz.asc b/webkitgtk-2.30.5.tar.xz.asc deleted file mode 100644 index 0e4f851..0000000 --- a/webkitgtk-2.30.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYCUHiQAKCRDz0yLQ7EWC -w8I6AJ4hDV60G2tVddh1tixxF917IzJMAQCgrVXuYcBzJLCCW8DQKinV0+Tpr2g= -=pUIp ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.30.6.tar.xz b/webkitgtk-2.30.6.tar.xz new file mode 100644 index 0000000..52099dc --- /dev/null +++ b/webkitgtk-2.30.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e +size 22311524 diff --git a/webkitgtk-2.30.6.tar.xz.asc b/webkitgtk-2.30.6.tar.xz.asc new file mode 100644 index 0000000..1973e79 --- /dev/null +++ b/webkitgtk-2.30.6.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYFNLTgAKCRDz0yLQ7EWC +w35WAKCP8A87TwYcHTgYCFkMn7JHCkG7hACg3KWA25hWQ/BiRs6bM+wNA1YZRuo= +=YVTk +-----END PGP SIGNATURE----- From d72d2a414f12947d65143a1d0b2481c38a9549af321b6131669d90f6fa4b9dfa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Mar 2021 16:40:54 +0000 Subject: [PATCH 2/2] Accepting request 881005 from GNOME:Next GNOME 40 - here we come OBS-URL: https://build.opensuse.org/request/show/881005 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=298 --- webkit-font-scaling.patch | 108 ----------------------------------- webkit2gtk3.changes | 55 ++++++++++++++++++ webkit2gtk3.spec | 14 ++--- webkitgtk-2.30.6.tar.xz | 3 - webkitgtk-2.30.6.tar.xz.asc | 6 -- webkitgtk-2.31.91.tar.xz | 3 + webkitgtk-2.31.91.tar.xz.asc | 6 ++ 7 files changed, 70 insertions(+), 125 deletions(-) delete mode 100644 webkit-font-scaling.patch delete mode 100644 webkitgtk-2.30.6.tar.xz delete mode 100644 webkitgtk-2.30.6.tar.xz.asc create mode 100644 webkitgtk-2.31.91.tar.xz create mode 100644 webkitgtk-2.31.91.tar.xz.asc diff --git a/webkit-font-scaling.patch b/webkit-font-scaling.patch deleted file mode 100644 index ef43f4a..0000000 --- a/webkit-font-scaling.patch +++ /dev/null @@ -1,108 +0,0 @@ -Index: webkitgtk-2.30.4/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -=================================================================== ---- webkitgtk-2.30.4.orig/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -+++ webkitgtk-2.30.4/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -@@ -81,7 +81,6 @@ struct _WebKitSettingsPrivate { - CString mediaContentTypesRequiringHardwareSupport; - bool allowModalDialogs { false }; - bool zoomTextOnly { false }; -- double screenDpi { 96 }; - #if PLATFORM(GTK) - bool enableBackForwardNavigationGestures { false }; - #endif -@@ -176,7 +175,6 @@ enum { - - static void webKitSettingsDispose(GObject* object) - { -- WebCore::setScreenDPIObserverHandler(nullptr, object); - G_OBJECT_CLASS(webkit_settings_parent_class)->dispose(object); - } - -@@ -191,23 +189,6 @@ static void webKitSettingsConstructed(GO - bool mediaStreamEnabled = prefs->mediaStreamEnabled(); - prefs->setMediaDevicesEnabled(mediaStreamEnabled); - prefs->setPeerConnectionEnabled(mediaStreamEnabled); -- -- settings->priv->screenDpi = WebCore::screenDPI(); -- WebCore::setScreenDPIObserverHandler([settings]() { -- auto newScreenDpi = WebCore::screenDPI(); -- if (newScreenDpi == settings->priv->screenDpi) -- return; -- -- auto scalingFactor = newScreenDpi / settings->priv->screenDpi; -- auto fontSize = settings->priv->preferences->defaultFontSize(); -- auto monospaceFontSize = settings->priv->preferences->defaultFixedFontSize(); -- settings->priv->screenDpi = newScreenDpi; -- -- g_object_freeze_notify(G_OBJECT(settings)); -- webkit_settings_set_default_font_size(settings, std::round(fontSize * scalingFactor)); -- webkit_settings_set_default_monospace_font_size(settings, std::round(monospaceFontSize * scalingFactor)); -- g_object_thaw_notify(G_OBJECT(settings)); -- }, object); - } - - static void webKitSettingsSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec) -Index: webkitgtk-2.30.4/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -=================================================================== ---- webkitgtk-2.30.4.orig/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -+++ webkitgtk-2.30.4/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -@@ -73,6 +73,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -306,6 +307,8 @@ struct _WebKitWebViewPrivate { - - GRefPtr websiteDataManager; - GRefPtr websitePolicies; -+ -+ double textScaleFactor; - }; - - static guint signals[LAST_SIGNAL] = { 0, }; -@@ -793,6 +796,15 @@ static void webkitWebViewConstructed(GOb - - priv->backForwardList = adoptGRef(webkitBackForwardListCreate(&getPage(webView).backForwardList())); - priv->windowProperties = adoptGRef(webkitWindowPropertiesCreate()); -+ -+ priv->textScaleFactor = WebCore::screenDPI() / 96.; -+ getPage(webView).setTextZoomFactor(priv->textScaleFactor); -+ WebCore::setScreenDPIObserverHandler([webView] { -+ auto& page = getPage(webView); -+ auto zoomFactor = page.textZoomFactor() / webView->priv->textScaleFactor; -+ webView->priv->textScaleFactor = WebCore::screenDPI() / 96.; -+ page.setTextZoomFactor(zoomFactor * webView->priv->textScaleFactor); -+ }, webView); - } - - static void webkitWebViewSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec) -@@ -956,6 +968,8 @@ static void webkitWebViewDispose(GObject - webView->priv->view->close(); - #endif - -+ WebCore::setScreenDPIObserverHandler(nullptr, webView); -+ - G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object); - } - -@@ -3600,7 +3614,7 @@ void webkit_web_view_set_zoom_level(WebK - auto& page = getPage(webView); - page.scalePage(1.0, IntPoint()); // Reset page scale when zoom level is changed - if (webkit_settings_get_zoom_text_only(webView->priv->settings.get())) -- page.setTextZoomFactor(zoomLevel); -+ page.setTextZoomFactor(zoomLevel * webView->priv->textScaleFactor); - else - page.setPageZoomFactor(zoomLevel); - g_object_notify(G_OBJECT(webView), "zoom-level"); -@@ -3621,7 +3635,7 @@ gdouble webkit_web_view_get_zoom_level(W - - auto& page = getPage(webView); - gboolean zoomTextOnly = webkit_settings_get_zoom_text_only(webView->priv->settings.get()); -- return zoomTextOnly ? page.textZoomFactor() : page.pageZoomFactor(); -+ return zoomTextOnly ? page.textZoomFactor() / webView->priv->textScaleFactor : page.pageZoomFactor(); - } - - /** diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 21adde9..ee0078c 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Tue Mar 23 02:31:51 UTC 2021 - Michael Gorse + +- Update to version 2.31.91: + + Make WebKitSecurityOrigin a simple data store for and deprecate webkit_security_origin_is_opaque(). + + Fix user agent again to work on several google websites. + + Fix web view url on web process terminate signals. + + Fix preferred language overrides sent to the web process. + + Fix the build in i386. + + Translation updates: Simplified Chinese. +- Drop webkitgtk-i586-build-fix.patch: fixed upstream. +- Disable webkit-process.patch: needs to be rebased or dropped. + +------------------------------------------------------------------- +Mon Mar 22 02:31:51 UTC 2021 - Michael Gorse + +- Add webkitgtk-i586-build-fix.patch: fix build on i586 + (webkit#222480). + +------------------------------------------------------------------- +Mon Mar 22 02:31:50 UTC 2021 - Michael Gorse + +- Update to version 2.31.90: + + Add permission request API for MediaKeySystem access. + + Fix rendering when using opacity filters on hardware + accelerated layers. + + Fix flatpak-spawn subsandbox to not clear environment + variables. + + Ensure a URI scheme handler can't be registered multiple times. + + Fix several crashes and rendering issues. + + The minimum required GStreamer version is now 1.14. + + CEA-608 closed captions support (requires + WEBKIT_GST_USE_PLAYBIN3=1 environment variable). + - Advertise CBCS decryption and VP9 support in Thunder. + - Advertise DASH as supported in the media player. + - Improved support for playbin3. + - Translation updates: Ukrainian. +- Up required gstreamer and gtk3 versions. + +------------------------------------------------------------------- +Mon Mar 22 02:31:01 UTC 2021 - Callum Farmer + +- Update to version 2.31.1: + + Remove support for NPAPI plugins. + + Enable the web process cache when PSON is enabled too. + + TLS errors and proxy settings APIs have been moved from + WebKitContext to WebKitWebsiteDataManager. + + Add new API to remove individual scripts/stylesheets using + WebKitUserContentManager. + + Correctly apply the system font scaling factor. + + Show main loop frames information in the web inspector. +- Remove webkit-font-scaling.patch: contained in upstream +- New build requirement: pkgconfig(manette-0.2). + ------------------------------------------------------------------- Sun Mar 21 20:33:09 UTC 2021 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 042ab34..d9ce1bc 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -31,7 +31,7 @@ %define _gold_linker 0 %endif Name: webkit2gtk3 -Version: 2.30.6 +Version: 2.31.91 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -44,11 +44,9 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox. Patch0: no-forced-sse.patch -# PATCH-FIX-UPSTREAM webkit-font-scaling.patch https://bugs.webkit.org/show_bug.cgi?id=218450 badshah400@gmail.com -- Fix system font scaling not applied to 'font-size: XXXpt' -Patch1: webkit-font-scaling.patch # Below patches are for 15.0/15.1 only -# PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary. +# PATCH-NEEDS-REBASE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary (was: PATCH-FIX-OPENSUSE). Patch100: webkit-process.patch # PATCH-FIX-OPENSUSE old-wayland-scanner.patch mgorse@suse.com -- pass code to wayland-scanner, rather than private-code Patch101: old-wayland-scanner.patch @@ -84,7 +82,7 @@ BuildRequires: pkgconfig(freetype2) >= 2.4.2 BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5 BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gnutls) >= 3.0.0 -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.3 +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.14.0 BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-audio-1.0) BuildRequires: pkgconfig(gstreamer-codecparsers-1.0) @@ -95,7 +93,7 @@ BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.2 BuildRequires: pkgconfig(libbrotlidec) >= 1.0.1 @@ -108,6 +106,7 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.1.7 +BuildRequires: pkgconfig(manette-0.2) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(upower-glib) %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 @@ -280,9 +279,8 @@ A small test browswer from webkit, useful for testing features. %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 -%patch1 -p1 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200 -%patch100 -p1 +#%patch100 -p1 %patch101 -p1 %endif diff --git a/webkitgtk-2.30.6.tar.xz b/webkitgtk-2.30.6.tar.xz deleted file mode 100644 index 52099dc..0000000 --- a/webkitgtk-2.30.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e -size 22311524 diff --git a/webkitgtk-2.30.6.tar.xz.asc b/webkitgtk-2.30.6.tar.xz.asc deleted file mode 100644 index 1973e79..0000000 --- a/webkitgtk-2.30.6.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYFNLTgAKCRDz0yLQ7EWC -w35WAKCP8A87TwYcHTgYCFkMn7JHCkG7hACg3KWA25hWQ/BiRs6bM+wNA1YZRuo= -=YVTk ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.31.91.tar.xz b/webkitgtk-2.31.91.tar.xz new file mode 100644 index 0000000..dca70eb --- /dev/null +++ b/webkitgtk-2.31.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a60b28dfbff1e25e53f63549cf6b68b7af97c7336947e705a32f234cad834c +size 23316948 diff --git a/webkitgtk-2.31.91.tar.xz.asc b/webkitgtk-2.31.91.tar.xz.asc new file mode 100644 index 0000000..69c2fa1 --- /dev/null +++ b/webkitgtk-2.31.91.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYEtgiQAKCRDz0yLQ7EWC +wwcQAJ9AwE9Fl+BlVcmZmDUtopye4M8pCACgoPfE/LSiYcB5/cIGodVFy6z/Y/8= +=ipus +-----END PGP SIGNATURE-----