summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-05 18:32:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:56 +0000
commitf83e0cb7f5e6b50356cc456f90cee471a5b7c39b (patch)
tree7acec18cecc6c1133384b3ccb19c077d26967670 /meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
parent8d93c2ae4d0678b130d43262946188b963686a3a (diff)
downloadpoky-f83e0cb7f5e6b50356cc456f90cee471a5b7c39b.tar.gz
webkitgtk: update to 2.18.3
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no longer present in upstream tree. However, a patch with different musl fixes has been added. The rest of the patches are rebased to the new tree. Libtasn is a new dependency. Disable Gstreamer GL support on x86 due to clashing headers problem. (From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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.patch182
1 files changed, 69 insertions, 113 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 d6f0ce3cd6..dfdc116018 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
@@ -1,7 +1,7 @@
1From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 1From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700 3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem 4Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem
5 5
6gcc-6 has now introduced stdlib.h in libstdc++ for better 6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using 7compliance and its including the C library stdlib.h using
@@ -15,68 +15,34 @@ and ends up with compile errors e.g.
15/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory 15/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
16 16
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19Upstream-Status: Pending
20 18
21 Source/cmake/WebKitMacros.cmake | 2 +- 19---
22 1 file changed, 1 insertion(+), 1 deletion(-) 20 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
21 Source/WebCore/PlatformGTK.cmake | 6 +++---
22 Source/WebKit/PlatformGTK.cmake | 2 +-
23 Source/cmake/WebKitMacros.cmake | 2 +-
24 Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
25 Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
26 6 files changed, 8 insertions(+), 8 deletions(-)
23 27
24Index: webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 28diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
25=================================================================== 29index bc37dd31..4e49871f 100644
26--- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 30--- a/Source/JavaScriptCore/shell/CMakeLists.txt
27+++ webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 31+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
28@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL 32@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
29 ) 33 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
30 34 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
31 include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES}) 35 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
32-include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) 36-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
33+include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) 37+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
34 38 add_executable(jsc ${JSC_SOURCES})
35 set(WebKitTestNetscapePlugIn_LIBRARIES 39 target_link_libraries(jsc ${JSC_LIBRARIES})
36 ${X11_LIBRARIES}
37Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
38===================================================================
39--- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt
40+++ webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt
41@@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES
42 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
43
44 include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
45-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
46+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
47 add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
48 target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
49Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
50===================================================================
51--- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt
52+++ webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt
53@@ -57,7 +57,7 @@ endif ()
54 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
55
56 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
57-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
58+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
59 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
60 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
61
62Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
63===================================================================
64--- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt
65+++ webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt
66@@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin
67 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
68
69 include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
70-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
71+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
72 40
73 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) 41diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
74 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) 42index 73506c74..8eb8b415 100644
75Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake 43--- a/Source/WebCore/PlatformGTK.cmake
76=================================================================== 44+++ b/Source/WebCore/PlatformGTK.cmake
77--- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake 45@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
78+++ webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
79@@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
80 ${GTK2_INCLUDE_DIRS} 46 ${GTK2_INCLUDE_DIRS}
81 ${GDK2_INCLUDE_DIRS} 47 ${GDK2_INCLUDE_DIRS}
82 ) 48 )
@@ -85,7 +51,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
85 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 51 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
86 ) 52 )
87 target_link_libraries(WebCorePlatformGTK2 53 target_link_libraries(WebCorePlatformGTK2
88@@ -346,7 +346,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP 54@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
89 target_include_directories(WebCorePlatformGTK PRIVATE 55 target_include_directories(WebCorePlatformGTK PRIVATE
90 ${WebCore_INCLUDE_DIRECTORIES} 56 ${WebCore_INCLUDE_DIRECTORIES}
91 ) 57 )
@@ -94,7 +60,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
94 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 60 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
95 ${GTK_INCLUDE_DIRS} 61 ${GTK_INCLUDE_DIRS}
96 ${GDK_INCLUDE_DIRS} 62 ${GDK_INCLUDE_DIRS}
97@@ -362,7 +362,7 @@ include_directories( 63@@ -321,7 +321,7 @@ include_directories(
98 "${WEBCORE_DIR}/bindings/gobject/" 64 "${WEBCORE_DIR}/bindings/gobject/"
99 ) 65 )
100 66
@@ -103,37 +69,11 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake
103 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 69 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
104 ) 70 )
105 71
106Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake 72diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
107=================================================================== 73index d83a2e77..401246f4 100644
108--- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/PlatformGTK.cmake 74--- a/Source/WebKit/PlatformGTK.cmake
109+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake 75+++ b/Source/WebKit/PlatformGTK.cmake
110@@ -20,7 +20,7 @@ include_directories( 76@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
111 ${WEBKIT2_DIR}/UIProcess/API/gtk
112 )
113
114-include_directories(SYSTEM
115+include_directories(
116 ${GDK3_INCLUDE_DIRS}
117 ${GLIB_INCLUDE_DIRS}
118 ${GTK3_INCLUDE_DIRS}
119Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
120===================================================================
121--- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
122+++ webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
123@@ -21,7 +21,7 @@ include_directories(
124 ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
125 )
126
127-include_directories(SYSTEM
128+include_directories(
129 ${ATSPI_INCLUDE_DIRS}
130 ${GLIB_INCLUDE_DIRS}
131 ${GSTREAMER_INCLUDE_DIRS}
132Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
133===================================================================
134--- webkitgtk-2.16.5.orig/Source/WebKit2/PlatformGTK.cmake
135+++ webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
136@@ -1156,7 +1156,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
137 target_include_directories(WebKitPluginProcess2 PRIVATE 77 target_include_directories(WebKitPluginProcess2 PRIVATE
138 ${WebKit2CommonIncludeDirectories} 78 ${WebKit2CommonIncludeDirectories}
139 ) 79 )
@@ -142,29 +82,45 @@ Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake
142 ${WebKit2CommonSystemIncludeDirectories} 82 ${WebKit2CommonSystemIncludeDirectories}
143 ${GTK2_INCLUDE_DIRS} 83 ${GTK2_INCLUDE_DIRS}
144 ${GDK2_INCLUDE_DIRS} 84 ${GDK2_INCLUDE_DIRS}
145Index: webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt 85diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
146=================================================================== 86index 7bc89543..d9818fa4 100644
147--- webkitgtk-2.16.5.orig/Source/JavaScriptCore/shell/CMakeLists.txt 87--- a/Source/cmake/WebKitMacros.cmake
148+++ webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt 88+++ b/Source/cmake/WebKitMacros.cmake
149@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 89@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target)
150
151 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
152 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
153-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
154+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
155 add_executable(jsc ${JSC_SOURCES})
156 target_link_libraries(jsc ${JSC_LIBRARIES})
157
158Index: webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
159===================================================================
160--- webkitgtk-2.16.5.orig/Source/cmake/WebKitMacros.cmake
161+++ webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake
162@@ -277,7 +277,7 @@ macro(WEBKIT_WRAP_SOURCELIST)
163 endmacro() 90 endmacro()
164 91
165 macro(WEBKIT_FRAMEWORK _target) 92 macro(WEBKIT_FRAMEWORK _target)
166- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) 93- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
167+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) 94+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
168 add_library(${_target} ${${_target}_LIBRARY_TYPE} 95 target_sources(${_target} PRIVATE
169 ${${_target}_HEADERS} 96 ${${_target}_HEADERS}
170 ${${_target}_SOURCES} 97 ${${_target}_SOURCES}
98diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
99index e832a86d..ce92c864 100644
100--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
101+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
102@@ -57,7 +57,7 @@ endif ()
103 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
104
105 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
106-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
107+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
108 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
109 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
110
111diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
112index 1be3dd52..7bdddf37 100644
113--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
114+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
115@@ -20,7 +20,7 @@ include_directories(
116 ${WEBKIT2_DIR}/UIProcess/API/gtk
117 )
118
119-include_directories(SYSTEM
120+include_directories(
121 ${GDK3_INCLUDE_DIRS}
122 ${GLIB_INCLUDE_DIRS}
123 ${GTK3_INCLUDE_DIRS}
124--
1252.14.1
126