diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-07-02 09:15:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-04 00:02:16 +0100 |
commit | 9267988e3036d627a4bad12102b455a53cb6501a (patch) | |
tree | 3a606a533e2f558bfca17ab2c55d63e6215ac78f /meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | |
parent | 8342cc7d2f00d6f881fd4e578f057859cffaa609 (diff) | |
download | poky-9267988e3036d627a4bad12102b455a53cb6501a.tar.gz |
webkitgtk: 2.20.2 -> 2.20.3
Upgrade webkitgtk from 2.20.2 to 2.20.3.
* update context of 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
* remove detect-atomics-during-configure.patch that webkitgtk 2.20.3
contains the commit of better solution, see
https://bugs.webkit.org/show_bug.cgi?id=161900#c9
(From OE-Core rev: 069426b0a7a6848a9290cd2e8cdce941d7e3c08c)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch index 034219f826..b31026448c 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | |||
@@ -41,18 +41,18 @@ index b3c7e0b..88446de 100644 | |||
41 | target_link_libraries(jsc ${JSC_LIBRARIES}) | 41 | target_link_libraries(jsc ${JSC_LIBRARIES}) |
42 | 42 | ||
43 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | 43 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake |
44 | index 32c6ccc..fef5e8b 100644 | 44 | index f7d8d70a..3c27b8bc 100644 |
45 | --- a/Source/WebCore/PlatformGTK.cmake | 45 | --- a/Source/WebCore/PlatformGTK.cmake |
46 | +++ b/Source/WebCore/PlatformGTK.cmake | 46 | +++ b/Source/WebCore/PlatformGTK.cmake |
47 | @@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | 47 | @@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
48 | ${GTK2_INCLUDE_DIRS} | 48 | target_include_directories(WebCorePlatformGTK2 PRIVATE |
49 | ${GDK2_INCLUDE_DIRS} | 49 | ${WebCore_INCLUDE_DIRECTORIES} |
50 | ) | 50 | ) |
51 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | 51 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE |
52 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | 52 | + target_include_directories(WebCorePlatformGTK2 PRIVATE |
53 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 53 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
54 | ) | 54 | ${GTK2_INCLUDE_DIRS} |
55 | target_link_libraries(WebCorePlatformGTK2 | 55 | ${GDK2_INCLUDE_DIRS} |
56 | @@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) | 56 | @@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) |
57 | target_include_directories(WebCorePlatformGTK PRIVATE | 57 | target_include_directories(WebCorePlatformGTK PRIVATE |
58 | ${WebCore_INCLUDE_DIRECTORIES} | 58 | ${WebCore_INCLUDE_DIRECTORIES} |