Accepting request 758297 from GNOME:Next

- Add webkit-process.patch: use single web process for evolution
  and geary on 15.0 (boo#1159329 glgo#GNOME/evolution#587).

OBS-URL: https://build.opensuse.org/request/show/758297
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=240
This commit is contained in:
Bjørn Lie 2019-12-19 19:33:53 +00:00 committed by Git OBS Bridge
parent 05dc32537e
commit cb1cfb221e
3 changed files with 43 additions and 1 deletions

29
webkit-process.patch Normal file
View File

@ -0,0 +1,29 @@
From: Mike Gorse <mgorse@suse.com>
Date: Thu 19 Dec 2019 10:33:14 AM EST
Subject: [patch] Use single web process for evolution and geary.
https://mail.gnome.org/archives/distributor-list/2019-October/msg00000.html
Index: webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
===================================================================
--- webkitgtk.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -348,8 +348,16 @@ ALLOW_DEPRECATED_DECLARATIONS_END
configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
- if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
- configuration.setUsesSingleWebProcess(true);
+ if (useSingleWebProcess) {
+ if (strcmp(useSingleWebProcess, "0")) {
+ configuration.setUsesSingleWebProcess(true);
+ }
+ } else {
+ const char* prgname = g_get_prgname();
+ if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary")) {
+ configuration.setUsesSingleWebProcess(true);
+ }
+ }
priv->processPool = WebProcessPool::create(configuration);
if (!priv->websiteDataManager)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 19 15:36:37 UTC 2019 - Michael Gorse <mgorse@suse.com>
- Add webkit-process.patch: use single web process for evolution
and geary on 15.0 (boo#1159329 glgo#GNOME/evolution#587).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 11 22:31:54 UTC 2019 - Michael Gorse <mgorse@suse.com> Mon Nov 11 22:31:54 UTC 2019 - Michael Gorse <mgorse@suse.com>

View File

@ -45,6 +45,8 @@ Source99: webkit2gtk3.keyring
Patch0: webkit2gtk3-fdo-soname.patch Patch0: webkit2gtk3-fdo-soname.patch
# PATCh-FIX-UPSTREAM webkit2gtk3-icu-build-fix.patch mgorse@suse.com -- fix build with icu 65.1. # PATCh-FIX-UPSTREAM webkit2gtk3-icu-build-fix.patch mgorse@suse.com -- fix build with icu 65.1.
Patch1: webkit2gtk3-icu-build-fix.patch Patch1: webkit2gtk3-icu-build-fix.patch
# PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary.
Patch2: webkit-process.patch
BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGL-devel
@ -270,7 +272,12 @@ A small test browswer from webkit, useful for testing features.
%lang_package -n %{_pkgname_no_slpp} %lang_package -n %{_pkgname_no_slpp}
%prep %prep
%autosetup -p1 -n webkitgtk-%{version} %setup -n webkitgtk-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} <= 1500
%patch2 -p1
%endif
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}