diff --git a/webkit-process.patch b/webkit-process.patch new file mode 100644 index 0000000..5614e92 --- /dev/null +++ b/webkit-process.patch @@ -0,0 +1,29 @@ +From: Mike Gorse +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) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 7f91993..0a36249 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 19 15:36:37 UTC 2019 - Michael Gorse + +- 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 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b128f7d..aeeb35b 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -45,6 +45,8 @@ Source99: webkit2gtk3.keyring Patch0: webkit2gtk3-fdo-soname.patch # PATCh-FIX-UPSTREAM webkit2gtk3-icu-build-fix.patch mgorse@suse.com -- fix build with icu 65.1. 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-libGL-devel @@ -270,7 +272,12 @@ A small test browswer from webkit, useful for testing features. %lang_package -n %{_pkgname_no_slpp} %prep -%autosetup -p1 -n webkitgtk-%{version} +%setup -n webkitgtk-%{version} +%patch0 -p1 +%patch1 -p1 +%if 0%{?suse_version} <= 1500 +%patch2 -p1 +%endif %build %define _lto_cflags %{nil}