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
This commit is contained in:
Git OBS Bridge
parent
dc9a8645bd
commit
d72d2a414f
@ -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 <WebCore/CertificateInfo.h>
|
||||
#include <WebCore/GUniquePtrSoup.h>
|
||||
#include <WebCore/JSDOMExceptionHandling.h>
|
||||
+#include <WebCore/PlatformScreen.h>
|
||||
#include <WebCore/RefPtrCairo.h>
|
||||
#include <WebCore/URLSoup.h>
|
||||
#include <glib/gi18n-lib.h>
|
||||
@@ -306,6 +307,8 @@ struct _WebKitWebViewPrivate {
|
||||
|
||||
GRefPtr<WebKitWebsiteDataManager> websiteDataManager;
|
||||
GRefPtr<WebKitWebsitePolicies> 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();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 23 02:31:51 UTC 2021 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Update to version 2.31.91:
|
||||
+ Make WebKitSecurityOrigin a simple data store for <protocol,
|
||||
host, port> 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 <mgorse@suse.com>
|
||||
|
||||
- Add webkitgtk-i586-build-fix.patch: fix build on i586
|
||||
(webkit#222480).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 22 02:31:50 UTC 2021 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- 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 <gmbr3@opensuse.org>
|
||||
|
||||
- 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 <mgorse@suse.com>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e
|
||||
size 22311524
|
||||
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYFNLTgAKCRDz0yLQ7EWC
|
||||
w35WAKCP8A87TwYcHTgYCFkMn7JHCkG7hACg3KWA25hWQ/BiRs6bM+wNA1YZRuo=
|
||||
=YVTk
|
||||
-----END PGP SIGNATURE-----
|
||||
3
webkitgtk-2.31.91.tar.xz
Normal file
3
webkitgtk-2.31.91.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:29a60b28dfbff1e25e53f63549cf6b68b7af97c7336947e705a32f234cad834c
|
||||
size 23316948
|
||||
6
webkitgtk-2.31.91.tar.xz.asc
Normal file
6
webkitgtk-2.31.91.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYEtgiQAKCRDz0yLQ7EWC
|
||||
wwcQAJ9AwE9Fl+BlVcmZmDUtopye4M8pCACgoPfE/LSiYcB5/cIGodVFy6z/Y/8=
|
||||
=ipus
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
x
Reference in New Issue
Block a user