summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
diff options
context:
space:
mode:
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.patch32
1 files changed, 16 insertions, 16 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 b31026448c..e71905d26a 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,4 +1,4 @@
1From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001 1From d1634e56a2589ec62325011bf77d480a67123b52 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] WebKitMacros: Append to -I and not to -isystem
@@ -28,10 +28,10 @@ Upstream-Status: Pending
28 6 files changed, 8 insertions(+), 8 deletions(-) 28 6 files changed, 8 insertions(+), 8 deletions(-)
29 29
30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt 30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
31index b3c7e0b..88446de 100644 31index 87153e35..cd0beed4 100644
32--- a/Source/JavaScriptCore/shell/CMakeLists.txt 32--- a/Source/JavaScriptCore/shell/CMakeLists.txt
33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt 33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
34@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 34@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) 35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) 36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) 37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
@@ -41,10 +41,10 @@ index b3c7e0b..88446de 100644
41 target_link_libraries(jsc ${JSC_LIBRARIES}) 41 target_link_libraries(jsc ${JSC_LIBRARIES})
42 42
43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake 43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
44index f7d8d70a..3c27b8bc 100644 44index e0dd9cd9..a2997f3e 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@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 47@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
48 target_include_directories(WebCorePlatformGTK2 PRIVATE 48 target_include_directories(WebCorePlatformGTK2 PRIVATE
49 ${WebCore_INCLUDE_DIRECTORIES} 49 ${WebCore_INCLUDE_DIRECTORIES}
50 ) 50 )
@@ -53,7 +53,7 @@ index f7d8d70a..3c27b8bc 100644
53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
54 ${GTK2_INCLUDE_DIRS} 54 ${GTK2_INCLUDE_DIRS}
55 ${GDK2_INCLUDE_DIRS} 55 ${GDK2_INCLUDE_DIRS}
56@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) 56@@ -190,7 +190,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}
59 ) 59 )
@@ -62,7 +62,7 @@ index f7d8d70a..3c27b8bc 100644
62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
63 ${GTK_INCLUDE_DIRS} 63 ${GTK_INCLUDE_DIRS}
64 ${GDK_INCLUDE_DIRS} 64 ${GDK_INCLUDE_DIRS}
65@@ -199,7 +199,7 @@ include_directories( 65@@ -206,7 +206,7 @@ include_directories(
66 "${WEBCORE_DIR}/bindings/gobject/" 66 "${WEBCORE_DIR}/bindings/gobject/"
67 ) 67 )
68 68
@@ -72,10 +72,10 @@ index f7d8d70a..3c27b8bc 100644
72 ) 72 )
73 73
74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
75index 8c6ebb5..772c243 100644 75index 693bbdfe..20e3802f 100644
76--- a/Source/WebKit/PlatformGTK.cmake 76--- a/Source/WebKit/PlatformGTK.cmake
77+++ b/Source/WebKit/PlatformGTK.cmake 77+++ b/Source/WebKit/PlatformGTK.cmake
78@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 78@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
79 target_include_directories(WebKitPluginProcess2 PRIVATE 79 target_include_directories(WebKitPluginProcess2 PRIVATE
80 ${WebKitCommonIncludeDirectories} 80 ${WebKitCommonIncludeDirectories}
81 ) 81 )
@@ -85,10 +85,10 @@ index 8c6ebb5..772c243 100644
85 ${GTK2_INCLUDE_DIRS} 85 ${GTK2_INCLUDE_DIRS}
86 ${GDK2_INCLUDE_DIRS} 86 ${GDK2_INCLUDE_DIRS}
87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake 87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
88index a1e7e8f..ce24274 100644 88index 6d58d57e..976e2362 100644
89--- a/Source/cmake/WebKitMacros.cmake 89--- a/Source/cmake/WebKitMacros.cmake
90+++ b/Source/cmake/WebKitMacros.cmake 90+++ b/Source/cmake/WebKitMacros.cmake
91@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target) 91@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
92 ${${_target}_SOURCES} 92 ${${_target}_SOURCES}
93 ) 93 )
94 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") 94 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
@@ -98,10 +98,10 @@ index a1e7e8f..ce24274 100644
98 target_link_libraries(${_target} ${${_target}_LIBRARIES}) 98 target_link_libraries(${_target} ${${_target}_LIBRARIES})
99 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") 99 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt 100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
101index dc2b61e..0128dca 100644 101index a0d32059..f259ade2 100644
102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt 102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt 103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
104@@ -57,7 +57,7 @@ endif () 104@@ -59,7 +59,7 @@ endif ()
105 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) 105 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
106 106
107 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) 107 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
@@ -111,10 +111,10 @@ index dc2b61e..0128dca 100644
111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
112 112
113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake 113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
114index 4aef695..a14b163 100644 114index 8dd0e146..d037fc35 100644
115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake 115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake 116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
117@@ -20,7 +20,7 @@ include_directories( 117@@ -22,7 +22,7 @@ include_directories(
118 ${WEBKIT_DIR}/UIProcess/API/gtk 118 ${WEBKIT_DIR}/UIProcess/API/gtk
119 ) 119 )
120 120
@@ -122,4 +122,4 @@ index 4aef695..a14b163 100644
122+include_directories( 122+include_directories(
123 ${GDK3_INCLUDE_DIRS} 123 ${GDK3_INCLUDE_DIRS}
124 ${GLIB_INCLUDE_DIRS} 124 ${GLIB_INCLUDE_DIRS}
125 ${GTK3_INCLUDE_DIRS} 125 ${GSTREAMER_INCLUDE_DIRS}