From 6228ba684841dfcea1f0a3b2c63bdeaf568e3cdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Mar 2012 12:21:30 -0700 Subject: webkit: Fix build with gcc-4.7 Include unistd.h for all linux and not just for android. (From OE-Core rev: c870606c9da2fa90df2cd7c4a198e3bf5340304b) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/files/function-scope.patch | 21 +++++++++++++++++++++ meta/recipes-sato/webkit/webkit-gtk_svn.bb | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-sato/webkit/files/function-scope.patch (limited to 'meta/recipes-sato/webkit') diff --git a/meta/recipes-sato/webkit/files/function-scope.patch b/meta/recipes-sato/webkit/files/function-scope.patch new file mode 100644 index 0000000000..a20a80501f --- /dev/null +++ b/meta/recipes-sato/webkit/files/function-scope.patch @@ -0,0 +1,21 @@ +we need to include unistd.h on all linux platforms therefore +extend the conditional inclusion accordingly + +This gets proper declation of sleep() into the source file + +Signed-off-by: Khem Raj + +Upstream-Status: Pending +Index: webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp +=================================================================== +--- webkit-gtk-1.7.2+svnr101488-r3.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:11:04.912613223 -0700 ++++ webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:14:21.840622752 -0700 +@@ -29,7 +29,7 @@ + #include + #include + +-#if defined(ANDROID) ++#if defined(__linux__) + #include + #endif + diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb index 9181c2cd2b..7db573d056 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb @@ -15,7 +15,7 @@ SRCREV_FORMAT = "source" SRCREV = "101488" PV = "1.7.2+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ @@ -28,6 +28,7 @@ SRC_URI = "\ file://GNUmakefile.am \ file://gtk-doc.make \ file://nodolt.patch \ + file://function-scope.patch \ " S = "${WORKDIR}/" -- cgit v1.2.3-54-g00ecf