diff --git a/.gitignore b/.gitignore index 91f9858..82cae97 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /webkitgtk-2.12.4.tar.xz /webkitgtk-2.12.5.tar.xz /webkitgtk-2.14.0.tar.xz +/webkitgtk-2.14.1.tar.xz diff --git a/sources b/sources index 9f3a052..84d7620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20f21f48677559750581471c7aeb8648 webkitgtk-2.14.0.tar.xz +8d6c60dc41604d3bbd43165a674c07e5 webkitgtk-2.14.1.tar.xz diff --git a/webkitgtk-2.14.1-user-agent-branding.patch b/webkitgtk-2.14.1-user-agent-branding.patch new file mode 100644 index 0000000..bfb4faf --- /dev/null +++ b/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 diff --git a/webkitgtk-2.7.90-user-agent-branding.patch b/webkitgtk-2.7.90-user-agent-branding.patch deleted file mode 100644 index 84b5117..0000000 --- a/webkitgtk-2.7.90-user-agent-branding.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 048ebbe..e293110 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.14.0 +Version: 2.14.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -14,8 +14,8 @@ 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=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 @@ -252,6 +252,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Oct 12 2016 Tomas Popela - 2.14.1-1 +- Update to 2.14.1 + * Tue Sep 20 2016 Tomas Popela - 2.14.0-1 - Update to 2.14.0