diff --git a/.gitignore b/.gitignore index 49e54d3..fd0bda4 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /webkitgtk-2.13.2.tar.xz /webkitgtk-2.13.3.tar.xz /webkitgtk-2.13.4.tar.xz +/webkitgtk-2.13.90.tar.xz diff --git a/sources b/sources index 26847f9..e243729 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af692763d3accee2c651e037039411e2 webkitgtk-2.13.4.tar.xz +66416639a997cb764adbfe6b8262ded0 webkitgtk-2.13.90.tar.xz diff --git a/webkitgtk-2.13.2-disable-npapi-in-wayland.patch b/webkitgtk-2.13.2-disable-npapi-in-wayland.patch index 7eb1fab..d8ca29f 100644 --- a/webkitgtk-2.13.2-disable-npapi-in-wayland.patch +++ b/webkitgtk-2.13.2-disable-npapi-in-wayland.patch @@ -1,22 +1,7 @@ -From 5e55ce4e097ed1bb76dd9fc8ae221c3765383e94 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 28 Jun 2016 10:36:40 -0500 -Subject: [PATCH] wayland: disable windowless NPAPI plugins - -They are seriously broken. We will not enable these in Fedora until the -upstream bug is fixed. The only known plugin this affects is the -gnome-shell browser plugin, which we don't want to support anyway due to -the huge number crash reports. ---- - Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp | 6 ++++++ - Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp -index 4ba4ac6..4a59d66 100644 ---- a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp -+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp -@@ -1621,6 +1621,12 @@ void webkit_settings_set_enable_plugins(WebKitSettings* settings, gboolean enabl +diff -up webkitgtk-2.13.90/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp.disable_npapi_in_wayland webkitgtk-2.13.90/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp +--- webkitgtk-2.13.90/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp.disable_npapi_in_wayland 2016-08-30 18:52:41.000000000 +0200 ++++ webkitgtk-2.13.90/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2016-08-31 12:59:03.398097549 +0200 +@@ -1621,6 +1621,12 @@ void webkit_settings_set_enable_plugins( { g_return_if_fail(WEBKIT_IS_SETTINGS(settings)); @@ -29,19 +14,16 @@ index 4ba4ac6..4a59d66 100644 WebKitSettingsPrivate* priv = settings->priv; bool currentValue = priv->preferences->pluginsEnabled(); if (currentValue == enabled) -diff --git a/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp -index ae14e9e..ed932b1 100644 ---- a/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp -+++ b/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp -@@ -39,6 +39,8 @@ void WebPreferences::platformInitializeStore() - // FIXME: Accelerated compositing under Wayland is not yet supported. - // https://bugs.webkit.org/show_bug.cgi?id=115803 - setAcceleratedCompositingEnabled(false); +diff -up webkitgtk-2.13.90/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp.disable_npapi_in_wayland webkitgtk-2.13.90/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp +--- webkitgtk-2.13.90/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp.disable_npapi_in_wayland 2016-08-30 18:52:41.000000000 +0200 ++++ webkitgtk-2.13.90/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2016-08-31 12:52:10.954610986 +0200 +@@ -69,6 +69,9 @@ void WebPreferences::platformInitializeS + if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland) { + if (!WaylandCompositor::singleton().isRunning()) + setAcceleratedCompositingEnabled(false); ++ + // https://bugs.webkit.org/show_bug.cgi?id=158697 + setPluginsEnabled(false); } #endif - #if USE(COORDINATED_GRAPHICS_THREADED) --- -2.7.4 - + diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 2a732be..e7b4853 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk4 -Version: 2.13.4 +Version: 2.13.90 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -20,6 +20,10 @@ Patch0: webkitgtk-2.7.90-user-agent-branding.patch # https://bugs.webkit.org/show_bug.cgi?id=158785 Patch1: fedora-crypto-policy.patch # https://bugs.webkit.org/show_bug.cgi?id=158697 +# They are seriously broken. We will not enable these in Fedora until the +# upstream bug is fixed. The only known plugin this affects is the +# gnome-shell browser plugin, which we don't want to support anyway due to +# the huge number crash reports. Patch2: webkitgtk-2.13.2-disable-npapi-in-wayland.patch BuildRequires: at-spi2-core-devel @@ -254,6 +258,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Aug 31 2016 Tomas Popela - 2.13.90-1 +- Update to 2.13.90 + * Wed Jul 27 2016 Tomas Popela - 2.13.4-1 - Update to 2.13.4