tpopela pushed to webkitgtk (master). "Add Fedora branding to the user agent"

[notifications at fedoraproject.org]

From 4f9511e0b241ab146a750bbced06128e1a108df1 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela at redhat.com>
Date: Mon, 11 May 2015 10:23:35 +0200
Subject: Add Fedora branding to the user agent


diff --git a/webkitgtk-2.4.8-user-agent.patch b/webkitgtk-2.4.8-user-agent.patch
new file mode 100644
index 0000000..84b5117
--- /dev/null
+++ b/webkitgtk-2.4.8-user-agent.patch
@@ -0,0 +1,27 @@
+From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro at 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
+
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 80796e5..bd1bd19 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -10,7 +10,7 @@
 
 Name:		webkitgtk
 Version:	2.4.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	GTK+ Web content engine library
 
 Group:		Development/Libraries
@@ -29,6 +29,8 @@ Patch4:         webkitgtk-2.4.1-ppc64_align.patch
 Patch5:         webkitgtk-2.4.8-gcc5.patch
 # https://bugs.webkit.org/show_bug.cgi?id=141381
 Patch6:         webkitgtk-2.4.8-gmutexlocker.patch
+# https://bugs.webkit.org/show_bug.cgi?id=142074
+Patch7:         webkitgtk-2.4.8-user-agent.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -96,6 +98,7 @@ This package contains developer documentation for %{name}.
 %patch2 -p1 -b .cloop_fix
 %patch5 -p1 -b .gcc5
 %patch6 -p1 -b .gmutex_locker
+%patch7 -p1 -b .user_agent
 # required for 32-bit big-endians
 %ifarch ppc s390
 %patch3 -p1 -b .cloop_fix_32
@@ -125,6 +128,10 @@ This package contains developer documentation for %{name}.
 # Regenerate configure to pick up the gcc 5.0 changes
 autoreconf -v
 
+%if 0%{?fedora}
+%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\'
+%endif
+
 %configure                                                      \
                         --with-gtk=2.0                          \
                         --disable-webkit2                       \
@@ -214,6 +221,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/webkitgtk
 
 %changelog
+* Mon May 11 2015 Tomas Popela <tpopela at redhat.com> - 2.4.8-5
+- Add Fedora branding to the user agent
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 2.4.8-4
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/webkitgtk.git/commit/?h=master&id=4f9511e0b241ab146a750bbced06128e1a108df1