diff options
| -rw-r--r-- | meta/recipes-sato/webkit/files/function-scope.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkit-gtk_svn.bb | 3 |
2 files changed, 23 insertions, 1 deletions
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 @@ | |||
| 1 | we need to include unistd.h on all linux platforms therefore | ||
| 2 | extend the conditional inclusion accordingly | ||
| 3 | |||
| 4 | This gets proper declation of sleep() into the source file | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Index: webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp | ||
| 10 | =================================================================== | ||
| 11 | --- webkit-gtk-1.7.2+svnr101488-r3.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:11:04.912613223 -0700 | ||
| 12 | +++ webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:14:21.840622752 -0700 | ||
| 13 | @@ -29,7 +29,7 @@ | ||
| 14 | #include <assert.h> | ||
| 15 | #include <string.h> | ||
| 16 | |||
| 17 | -#if defined(ANDROID) | ||
| 18 | +#if defined(__linux__) | ||
| 19 | #include <unistd.h> | ||
| 20 | #endif | ||
| 21 | |||
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" | |||
| 15 | 15 | ||
| 16 | SRCREV = "101488" | 16 | SRCREV = "101488" |
| 17 | PV = "1.7.2+svnr${SRCPV}" | 17 | PV = "1.7.2+svnr${SRCPV}" |
| 18 | PR = "r3" | 18 | PR = "r4" |
| 19 | 19 | ||
| 20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
| 21 | svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ | 21 | svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ |
| @@ -28,6 +28,7 @@ SRC_URI = "\ | |||
| 28 | file://GNUmakefile.am \ | 28 | file://GNUmakefile.am \ |
| 29 | file://gtk-doc.make \ | 29 | file://gtk-doc.make \ |
| 30 | file://nodolt.patch \ | 30 | file://nodolt.patch \ |
| 31 | file://function-scope.patch \ | ||
| 31 | " | 32 | " |
| 32 | 33 | ||
| 33 | S = "${WORKDIR}/" | 34 | S = "${WORKDIR}/" |
