jsc and MiniBrowser are now installed into libexec instead of bin

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>

.gitignore

@@ -24,6 +24,12 @@
 /webkitgtk-2.10.1.tar.xz
 /webkitgtk-2.10.2.tar.xz
 /webkitgtk-2.10.3.tar.xz
+/webkitgtk-2.10.4.tar.xz
+/webkitgtk-2.10.5.tar.xz
+/webkitgtk-2.10.6.tar.xz
+/webkitgtk-2.10.7.tar.xz
+/webkitgtk-2.10.8.tar.xz
+/webkitgtk-2.10.9.tar.xz
 /webkitgtk-2.11.1.tar.xz
 /webkitgtk-2.11.2.tar.xz
 /webkitgtk-2.11.3.tar.xz
@@ -35,3 +41,8 @@
 /webkitgtk-2.12.0.tar.xz
 /webkitgtk-2.12.1.tar.xz
 /webkitgtk-2.12.2.tar.xz
+/webkitgtk-2.12.3.tar.xz
+/webkitgtk-2.12.4.tar.xz
+/webkitgtk-2.12.5.tar.xz
+/webkitgtk-2.14.0.tar.xz
+/webkitgtk-2.14.1.tar.xz

fedora-crypto-policy.patch

@@ -0,0 +1,39 @@
+From e583c6f7deb86406f7e0375c560503858f4831ca Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Sun, 19 Jun 2016 21:10:03 -0500
+Subject: [PATCH] https://fedoraproject.org/wiki/Packaging:CryptoPolicies
+
+---
+ Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp | 2 +-
+ Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp b/Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
+index b282e16..ed8bbbd 100644
+--- a/Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
++++ b/Source/WebKit2/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
+@@ -39,7 +39,7 @@ int main(int argc, char** argv)
+     // overwrite this priority string if it's already set by the user.
+     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
+     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
+-    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0:!ARCFOUR-128", 0);
++    setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0:!ARCFOUR-128", 0);
+ 
+     return NetworkProcessMainUnix(argc, argv);
+ }
+diff --git a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp
+index 5f45d01..2b34ead 100644
+--- a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp
++++ b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp
+@@ -39,7 +39,7 @@ int main(int argc, char** argv)
+     // overwrite this priority string if it's already set by the user.
+     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
+     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
+-    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0:!ARCFOUR-128", 0);
++    setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0:!ARCFOUR-128", 0);
+ 
+     return WebProcessMainUnix(argc, argv);
+ }
+-- 
+2.7.4
+

sources

@@ -1 +1 @@
-41e018d651413fdbcd4b6480ab1fbd7b  webkitgtk-2.12.2.tar.xz
+8d6c60dc41604d3bbd43165a674c07e5  webkitgtk-2.14.1.tar.xz

webkitgtk-2.10.4-nspluginwrapper.patch

@@ -0,0 +1,13 @@
+diff -up webkitgtk-2.10.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.nspluginwrapper webkitgtk-2.10.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
+--- webkitgtk-2.10.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.nspluginwrapper	2015-11-11 11:46:43.848699104 +0100
++++ webkitgtk-2.10.4/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp	2015-11-11 11:47:44.450490935 +0100
+@@ -68,6 +68,9 @@ Vector<String> 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");
+ #endif
+ 
+     return result;

webkitgtk-2.11.5-youtube.patch

@@ -1,34 +0,0 @@
-diff -up webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
---- webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig	2016-02-09 10:04:54.898217667 +0100
-+++ webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2016-02-09 10:13:35.080875509 +0100
-@@ -1734,7 +1734,7 @@ static HashSet<String, ASCIICaseInsensit
-             "video/flv",
-             "video/mj2",
-             "video/mp2t",
--            "video/mp4",
-+//            "video/mp4",
-             "video/mpeg",
-             "video/mpegts",
-             "video/ogg",
-@@ -1759,6 +1759,21 @@ static HashSet<String, ASCIICaseInsensit
-         };
-         for (auto& type : mimeTypes)
-             set.add(type);
-+
-+        // Hack to make YouTube work, https://bugs.webkit.org/show_bug.cgi?id=135972
-+        gint exit_status = 1;
-+        GUniqueOutPtr<GError> error;
-+        GUniqueOutPtr<char> stdout_to_discard;
-+        GUniqueOutPtr<char> stderr_to_discard;
-+        gboolean success = g_spawn_command_line_sync(
-+            "rpm -qi gstreamer1-libav",
-+            &stdout_to_discard.outPtr(),
-+            &stderr_to_discard.outPtr(),
-+            &exit_status,
-+            &error.outPtr());
-+        if (success && !error && !exit_status)
-+            set.add(String::fromUTF8("video/mp4"));
-+
-         return set;
-     }();
-     return cache;

webkitgtk-2.14.1-user-agent-branding.patch

@@ -0,0 +1,14 @@
+diff -up webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp.orig webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp
+--- webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp.orig	2016-10-12 07:59:25.670057792 +0200
++++ webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp	2016-10-12 08:01:06.251878684 +0200
+@@ -121,6 +121,10 @@ static String buildUserAgentString(const
+
+     uaString.appendLiteral("; ");
+
++#ifdef USER_AGENT_GTK_DISTRIBUTOR_NAME
++    uaString.appendLiteral(USER_AGENT_GTK_DISTRIBUTOR_NAME "; ");
++#endif
++
+     if (quirks.contains(UserAgentQuirks::NeedsMacintoshPlatform))
+         uaString.appendLiteral("Intel Mac OS X 10_12");
+     else

webkitgtk-2.7.90-user-agent-branding.patch

@@ -1,27 +0,0 @@
-From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@igalia.com>
-Date: Thu, 26 Feb 2015 16:06:36 -0600
-Subject: [PATCH] Allow branding the user agent
-
----
- Source/WebCore/platform/gtk/UserAgentGtk.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/gtk/UserAgentGtk.cpp b/Source/WebCore/platform/gtk/UserAgentGtk.cpp
-index 91641dc..727fbaf 100644
---- a/Source/WebCore/platform/gtk/UserAgentGtk.cpp
-+++ b/Source/WebCore/platform/gtk/UserAgentGtk.cpp
-@@ -84,7 +84,9 @@ static const char* cpuDescriptionForUAString()
- 
- static const char* platformForUAString()
- {
--#if PLATFORM(X11)
-+#if defined USER_AGENT_GTK_DISTRIBUTOR_NAME
-+    return USER_AGENT_GTK_DISTRIBUTOR_NAME;
-+#elif PLATFORM(X11)
-     return "X11";
- #elif OS(WINDOWS)
-     return "";
--- 
-2.1.0
-

webkitgtk4.spec

@@ -6,18 +6,19 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.12.2
-Release:        2%{?dist}
+Version:        2.14.1
+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
 
-# https://bugs.webkit.org/show_bug.cgi?id=142074
-Patch0:         webkitgtk-2.7.90-user-agent-branding.patch
-# https://bugs.webkit.org/show_bug.cgi?id=135972
-Patch1:         webkitgtk-2.11.5-youtube.patch
+# https://bugs.webkit.org/show_bug.cgi?id=162611
+Patch0:         webkitgtk-2.14.1-user-agent-branding.patch
+# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
+# https://bugs.webkit.org/show_bug.cgi?id=158785
+Patch1:         fedora-crypto-policy.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -56,6 +57,7 @@ BuildRequires:  perl-Switch
 BuildRequires:  ruby rubypick rubygems
 BuildRequires:  sqlite-devel
 BuildRequires:  hyphen-devel
+BuildRequires:  gnutls-devel
 %ifarch ppc
 BuildRequires:  libatomic
 %endif
@@ -66,9 +68,11 @@ Requires:       geoclue2
 Obsoletes:      libwebkit2gtk < 2.5.0
 Provides:       libwebkit2gtk = %{version}-%{release}
 
-# We're supposed to specify a version here, but this is pointless because ANGLE
-# doesn't do normal releases. WebKit uses git snapshots.
-Provides:	bundled(angle)
+# We're supposed to specify versions here, but these crap Google libs don't do
+# normal releases. Accordingly, they're not suitable to be system libs.
+Provides:       bundled(angle)
+Provides:       bundled(brotli)
+Provides:       bundled(woff2)
 
 # Require the jsc subpackage
 Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
@@ -169,7 +173,7 @@ pushd %{_target_platform}
 %ifarch s390 s390x ppc %{power64} aarch64 %{mips}
   -DENABLE_JIT=OFF \
 %endif
-%ifarch s390 s390x ppc %{power64} %{arm} aarch64 %{mips}
+%ifarch s390 s390x ppc %{power64} aarch64 %{mips}
   -DUSE_SYSTEM_MALLOC=ON \
 %endif
   ..
@@ -216,7 +220,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2
 
 %files devel
-%{_bindir}/MiniBrowser
+%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
 %{_includedir}/webkitgtk-4.0/
 %exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore
 %{_libdir}/libwebkit2gtk-4.0.so
@@ -231,7 +235,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
 
 %files jsc-devel
-%{_bindir}/jsc
+%{_libexecdir}/webkit2gtk-4.0/jsc
 %dir %{_includedir}/webkitgtk-4.0
 %{_includedir}/webkitgtk-4.0/JavaScriptCore/
 %{_libdir}/libjavascriptcoregtk-4.0.so
@@ -248,6 +252,24 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Wed Oct 12 2016 Tomas Popela <tpopela@redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
+* Tue Sep 20 2016 Tomas Popela <tpopela@redhat.com> - 2.14.0-1
+- Update to 2.14.0
+
+* Mon Sep 05 2016 Tomas Popela <tpopela@redhat.com> - 2.12.5-1
+- Update to 2.12.5
+
+* Thu Sep 01 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.12.4-2
+- Add patch for network loader regression
+
+* Wed Aug 24 2016 Tomas Popela <tpopela@redhat.com> - 2.12.4-1
+- Update to 2.12.4
+
+* Tue May 24 2016 Tomas Popela <tpopela@redhat.com> - 2.12.3-1
+- Update to 2.12.3
+
 * Fri Apr 29 2016 Igor Gnatenko <ignatenko@redhat.com> - 2.12.2-2
 - Remove typelib from jsc-devel because it is in jsc
 
@@ -271,89 +293,27 @@ make %{?_smp_mflags} -C %{_target_platform}
 - Attempt to ensure plugin-process-gtk2 is installed on upgrade
 - Add patch for WebKit#155885
 
-* Tue Mar 22 2016 Tomas Popela <tpopela@redhat.com> - 2.12.0-1
+* Wed Mar 23 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.12.0-1
 - Update to 2.12.0
 
-* Sun Mar 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.11.92-3
-- Add missing ldconfig call for jsc subpkg
+* Thu Mar 17 2016 Tomas Popela <tpopela@redhat.com> - 2.10.9-1
+- Update to 2.10.9
 
-* Thu Mar 17 2016 Tomas Popela <tpopela@redhat.com> - 2.11.92-2
-- Fix the build with gcc6
+* Fri Mar 11 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.10.8-1
+- Update to 2.10.8
 
-* Thu Mar 17 2016 Tomas Popela <tpopela@redhat.com> - 2.11.92-1
-- Update to 2.11.92
+* Mon Feb 01 2016 Tomas Popela <tpopela@redhat.com> - 2.10.7-1
+- Update to 2.10.7
 
-* Tue Mar 15 2016 Tomas Popela <tpopela@redhat.com> - 2.11.91-2
-- Subpackage the WebKitPluginProcess2
-- Resolves: rhbz#1317692
+* Thu Jan 28 2016 Tomas Popela <tpopela@redhat.com> - 2.10.6-1
+- Update to 2.10.6
 
-* Tue Mar 01 2016 Tomas Popela <tpopela@redhat.com> - 2.11.91-1
-- Update to 2.11.91
+* Wed Jan 20 2016 Tomas Popela <tpopela@redhat.com> - 2.10.5-1
+- Update to 2.10.5
+- Fixes CVE-2015-7096, CVE-2015-7098
 
-* Mon Feb 29 2016 David King <amigadave@amigadave.com> - 2.11.90-4
-- Move JavaScriptCore headers to jsc-devel subpackage (#1312894)
-
-* Wed Feb 24 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.11.90-3
-- Stop building with ENABLE_OPENGL=OFF, see WebKit#126122 and WebKit#150955.
-
-* Mon Feb 22 2016 Tomas Popela <tpopela@redhat.com> - 2.11.90-1
-- Update to 2.11.90
-
-* Tue Feb  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2.11.5-2
-- Add ruby deps for build
-
-* Tue Feb 09 2016 Tomas Popela <tpopela@redhat.com> - 2.11.5-1
-- Update to 2.11.5
-- Drop the llvm dependencies as we switched to B3
-- Rebase the YouTube patch
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jan 28 2016 Tomas Popela <tpopela@redhat.com> - 2.11.4-2
-- Rebuilt for LLVM rebase
-
-* Wed Jan 20 2016 Tomas Popela <tpopela@redhat.com> - 2.11.4-1
-- Update to 2.11.4
-
-* Wed Jan 13 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.11.3-2
-- Build with ENABLE_OPENGL=OFF as I think it is causing bugs.
-- Stop static linking to LLVM.
-
-* Wed Jan 13 2016 Tomas Popela <tpopela@redhat.com> - 2.11.3-1
-- Update to 2.11.3
-
-* Wed Dec 30 2015 Michael Catanzaro <mcatanzaro@igalia.com> - 2.11.2-6
-- Remove webkitgtk-2.5.90-cloop_fix.patch and
-  webkitgtk-2.8.0-page_size_align.patch. These have been broken for ages.
-- Remove webkitgtk-2.8.0-s390_fixes.patch since this is a patch for bmalloc, but
-  we disable bmalloc on s390.
-- Don't request hardened build, it's the default.
-- Use public USE_SYSTEM_MALLOC option instead of unsupported USE_BMALLOC.
-- lldb is not bundled anymore.
-
-* Wed Dec 30 2015 Michal Toman <mtoman@fedoraproject.org> - 2.11.2-5
-- Add support for MIPS
-
-* Mon Dec 28 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.11.2-4
-- Rebuilt for libwebp soname bump
-
-* Mon Dec 07 2015 Tomas Popela <tpopela@redhat.com> - 2.11.2-3
-- rhbz#1289053 - Retire nspluginwrapper and remove from Fedora 24
-
-* Mon Nov 30 2015 Tomas Popela <tpopela@redhat.com> - 2.11.2-2
-- Introduce the jsc and jsc-devel subpackages with JavaScriptCore packaged
-- Resolves: rhbz#1176677
-
-* Mon Nov 23 2015 Tomas Popela <tpopela@redhat.com> - 2.11.2-1
-- Update to 2.11.2
-- Enable FTL on x86_64
-
-* Tue Nov 03 2015 Tomas Popela <tpopela@redhat.com> - 2.11.1-1
-- Update to 2.11.1
-
-* Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 2.10.3-2
-- rebuild for ICU 56.1
+* Wed Nov 11 2015 Tomas Popela <tpopela@redhat.com> - 2.10.4-1
+- Update to 2.10.4
 
 * Tue Oct 27 2015 Tomas Popela <tpopela@redhat.com> - 2.10.3-1
 - Update to 2.10.3
@@ -367,9 +327,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 * Wed Oct 14 2015 Tomas Popela <tpopela@redhat.com> - 2.10.1-1
 - Update to 2.10.1
 
-* Fri Oct 09 2015 Michael Catanzaro <mcatanzaro@igalia.com> - 2.10.0-2
-- Add provides bundled(angle) since it's finally safe to do so.
-
 * Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 2.10.0-1
 - Update to 2.10.0