[webkitgtk] Fix string issue causing failure to build. Already upstreamed.

[Kevin Fenzi]

commit 25aad343dbc1f348fb8f902ec8308522da84325a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Jan 20 23:31:22 2012 -0700

    Fix string issue causing failure to build. Already upstreamed.

 webkit-1.6.1-stringfix.patch |   19 +++++++++++++++++++
 webkit-1.6.1-unistd.patch    |   11 +++++++++++
 webkitgtk.spec               |   14 +++++++++++---
 3 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/webkit-1.6.1-stringfix.patch b/webkit-1.6.1-stringfix.patch
new file mode 100644
index 0000000..101fd79
--- /dev/null
+++ b/webkit-1.6.1-stringfix.patch
@@ -0,0 +1,19 @@
+diff -Nur webkit-1.6.1.orig/Source/WebCore/plugins/gtk/PluginViewGtk.cpp webkit-1.6.1/Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+--- webkit-1.6.1.orig/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2011-09-26 14:55:00.000000000 -0600
++++ webkit-1.6.1/Source/WebCore/plugins/gtk/PluginViewGtk.cpp	2012-01-20 22:12:46.198961426 -0700
+@@ -71,6 +71,7 @@
+ #include <gtk/gtk.h>
+ 
+ #if defined(XP_UNIX)
++#define String XtStringType
+ #include "RefPtrCairo.h"
+ #include "gtk2xtbin.h"
+ #define Bool int // this got undefined somewhere
+@@ -81,6 +82,7 @@
+ #elif defined(GDK_WINDOWING_WIN32)
+ #include "PluginMessageThrottlerWin.h"
+ #include <gdk/gdkwin32.h>
++#undef String
+ #endif
+ 
+ using JSC::ExecState;
diff --git a/webkit-1.6.1-unistd.patch b/webkit-1.6.1-unistd.patch
new file mode 100644
index 0000000..fc7cc6a
--- /dev/null
+++ b/webkit-1.6.1-unistd.patch
@@ -0,0 +1,11 @@
+diff -Nur webkit-1.6.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp webkit-1.6.1/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
+--- webkit-1.6.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	2011-09-26 14:55:03.000000000 -0600
++++ webkit-1.6.1/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp	2012-01-20 23:06:40.282863869 -0700
+@@ -28,6 +28,7 @@
+ #include "PluginObject.h"
+ #include <assert.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ extern NPNetscapeFuncs *browser;
diff --git a/webkitgtk.spec b/webkitgtk.spec
index e11e8c1..5ef7466 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.6.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -59,6 +59,10 @@ Patch2: 	webkit-1.3.10-nspluginwrapper.patch
 Patch3:         webkit-1.6.1-dtoa-s390.patch
 # GMutex changed type, eh.
 Patch4:		webkit-1.6.1-new-glib.patch
+# Fix string def
+Patch5:         webkit-1.6.1-stringfix.patch
+# add unistd.h include
+Patch6:         webkit-1.6.1-unistd.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -124,6 +128,8 @@ LICENSE, README, and AUTHORS files.
 %patch2 -p1 -b .nspluginwrapper
 %patch3 -p1 -b .dtoa-s390
 %patch4 -p1 -b .glib
+%patch5 -p1 -b .stringfix
+%patch6 -p1 -b .unistd
 
 %build
 %ifarch s390
@@ -147,8 +153,7 @@ mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
 
 # Disabled because of https://bugs.webkit.org/show_bug.cgi?id=34846
-make %{?_smp_mflags}
-#make
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -213,6 +218,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_docdir}/%{name}-%{version}/
 
 %changelog
+* Fri Jan 20 2012 Kevin Fenzi <kevin at scrye.com> - 1.6.1-5
+- Fix string issue causing failure to build. Already upstreamed. 
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild