diff --git a/.gitignore b/.gitignore index fd0bda4..0d457b0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /webkitgtk-2.13.3.tar.xz /webkitgtk-2.13.4.tar.xz /webkitgtk-2.13.90.tar.xz +/webkitgtk-2.13.91.tar.xz diff --git a/sources b/sources index e243729..9462c07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66416639a997cb764adbfe6b8262ded0 webkitgtk-2.13.90.tar.xz +0cd592539ded6a4b2997a3af0363c68a webkitgtk-2.13.91.tar.xz diff --git a/webkitgtk-2.13.2-disable-npapi-in-wayland.patch b/webkitgtk-2.13.2-disable-npapi-in-wayland.patch deleted file mode 100644 index d8ca29f..0000000 --- a/webkitgtk-2.13.2-disable-npapi-in-wayland.patch +++ /dev/null @@ -1,29 +0,0 @@ -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)); - -+#if PLATFORM(WAYLAND) -+ // https://bugs.webkit.org/show_bug.cgi?id=158697 -+ if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) -+ return; -+#endif -+ - WebKitSettingsPrivate* priv = settings->priv; - bool currentValue = priv->preferences->pluginsEnabled(); - if (currentValue == enabled) -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 - diff --git a/webkitgtk4.spec b/webkitgtk4.spec index e7b4853..ac3d84a 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -19,12 +19,6 @@ Patch0: webkitgtk-2.7.90-user-agent-branding.patch # https://fedoraproject.org/wiki/Packaging:CryptoPolicies # 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 BuildRequires: bison @@ -258,6 +252,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Mon Sep 12 2016 Tomas Popela - 2.13.91-1 +- Update to 2.13.91 + * Wed Aug 31 2016 Tomas Popela - 2.13.90-1 - Update to 2.13.90