diff --git a/.gitignore b/.gitignore index 8fecc44..1e30051 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /webkitgtk-2.9.1.tar.xz /webkitgtk-2.9.2.tar.xz /webkitgtk-2.9.3.tar.xz +/webkitgtk-2.9.4.tar.xz diff --git a/sources b/sources index 1aabf95..489e062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea81abf7715cd6da42888b35c4a67634 webkitgtk-2.9.3.tar.xz +e17a76b18e1d67c4eac2495f55970964 webkitgtk-2.9.4.tar.xz diff --git a/webkitgtk-2.7.4-nspluginwrapper.patch b/webkitgtk-2.7.4-nspluginwrapper.patch deleted file mode 100644 index 0597170..0000000 --- a/webkitgtk-2.7.4-nspluginwrapper.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up webkitgtk-2.7.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp.nspluginwrapper webkitgtk-2.7.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp ---- webkitgtk-2.7.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp.nspluginwrapper 2015-01-20 16:03:04.559447393 +0100 -+++ webkitgtk-2.7.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2015-01-20 16:04:01.525303372 +0100 -@@ -66,6 +66,9 @@ Vector PluginInfoStore::pluginsD - result.append("/usr/lib64/mozilla/plugins"); - result.append("/usr/lib/nsbrowser/plugins"); - result.append("/usr/lib64/nsbrowser/plugins"); -+ /* nspluginwrapper plugins */ -+ result.append("/usr/lib64/mozilla/plugins-wrapped"); -+ result.append("/usr/lib/mozilla/plugins-wrapped"); - - String mozillaHome(getenv("MOZILLA_HOME")); - if (!mozillaHome.isEmpty()) diff --git a/webkitgtk-2.9.4-nspluginwrapper.patch b/webkitgtk-2.9.4-nspluginwrapper.patch new file mode 100644 index 0000000..88ee493 --- /dev/null +++ b/webkitgtk-2.9.4-nspluginwrapper.patch @@ -0,0 +1,14 @@ +diff -up webkitgtk-2.9.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.nspluginwrapper webkitgtk-2.9.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp +--- webkitgtk-2.9.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.nspluginwrapper 2015-07-22 09:22:28.761782915 +0200 ++++ webkitgtk-2.9.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp 2015-07-22 09:23:03.796351404 +0200 +@@ -57,6 +57,9 @@ Vector pluginsDirectories() + result.append("/usr/lib64/mozilla/plugins"); + result.append("/usr/lib/nsbrowser/plugins"); + result.append("/usr/lib64/nsbrowser/plugins"); ++ /* nspluginwrapper plugins */ ++ result.append("/usr/lib64/mozilla/plugins-wrapped"); ++ result.append("/usr/lib/mozilla/plugins-wrapped"); + + String mozillaHome(getenv("MOZILLA_HOME")); + if (!mozillaHome.isEmpty()) +diff -up webkitgtk-2.9.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp.nspluginwrapper webkitgtk-2.9.4/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp diff --git a/webkitgtk4.spec b/webkitgtk4.spec index f4e6414..f399d6d 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -8,15 +8,15 @@ %global _hardened_build 1 Name: webkitgtk4 -Version: 2.9.3 -Release: 3%{?dist} +Version: 2.9.4 +Release: 1%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Patch0: webkitgtk-2.7.4-nspluginwrapper.patch +Patch0: webkitgtk-2.9.4-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch1: webkitgtk-2.7.90-user-agent-branding.patch # CLoop fixes (applied just on secondary arches) @@ -224,6 +224,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Jul 22 2015 Tomas Popela - 2.9.4-1 +- Update to 2.9.4 + * Thu Jul 09 2015 Michael Catanzaro 2.9.3-3 - Prevent runaway web processes from using unlimited memory.