diff options
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 | 32 |
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 @@ -From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001 +From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 17 Apr 2016 12:35:41 -0700 Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem @@ -28,10 +28,10 @@ Upstream-Status: Pending 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt -index b3c7e0b..88446de 100644 +index 87153e35..cd0beed4 100644 --- a/Source/JavaScriptCore/shell/CMakeLists.txt +++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() +@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) @@ -41,10 +41,10 @@ index b3c7e0b..88446de 100644 target_link_libraries(jsc ${JSC_LIBRARIES}) diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake -index f7d8d70a..3c27b8bc 100644 +index e0dd9cd9..a2997f3e 100644 --- a/Source/WebCore/PlatformGTK.cmake +++ b/Source/WebCore/PlatformGTK.cmake -@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) +@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) target_include_directories(WebCorePlatformGTK2 PRIVATE ${WebCore_INCLUDE_DIRECTORIES} ) @@ -53,7 +53,7 @@ index f7d8d70a..3c27b8bc 100644 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} ${GTK2_INCLUDE_DIRS} ${GDK2_INCLUDE_DIRS} -@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) +@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore) target_include_directories(WebCorePlatformGTK PRIVATE ${WebCore_INCLUDE_DIRECTORIES} ) @@ -62,7 +62,7 @@ index f7d8d70a..3c27b8bc 100644 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} ${GTK_INCLUDE_DIRS} ${GDK_INCLUDE_DIRS} -@@ -199,7 +199,7 @@ include_directories( +@@ -206,7 +206,7 @@ include_directories( "${WEBCORE_DIR}/bindings/gobject/" ) @@ -72,10 +72,10 @@ index f7d8d70a..3c27b8bc 100644 ) diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 8c6ebb5..772c243 100644 +index 693bbdfe..20e3802f 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) +@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) target_include_directories(WebKitPluginProcess2 PRIVATE ${WebKitCommonIncludeDirectories} ) @@ -85,10 +85,10 @@ index 8c6ebb5..772c243 100644 ${GTK2_INCLUDE_DIRS} ${GDK2_INCLUDE_DIRS} diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index a1e7e8f..ce24274 100644 +index 6d58d57e..976e2362 100644 --- a/Source/cmake/WebKitMacros.cmake +++ b/Source/cmake/WebKitMacros.cmake -@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target) +@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target) ${${_target}_SOURCES} ) target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") @@ -98,10 +98,10 @@ index a1e7e8f..ce24274 100644 target_link_libraries(${_target} ${${_target}_LIBRARIES}) set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt -index dc2b61e..0128dca 100644 +index a0d32059..f259ade2 100644 --- a/Tools/MiniBrowser/gtk/CMakeLists.txt +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt -@@ -57,7 +57,7 @@ endif () +@@ -59,7 +59,7 @@ endif () add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) @@ -111,10 +111,10 @@ index dc2b61e..0128dca 100644 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake -index 4aef695..a14b163 100644 +index 8dd0e146..d037fc35 100644 --- a/Tools/TestWebKitAPI/PlatformGTK.cmake +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake -@@ -20,7 +20,7 @@ include_directories( +@@ -22,7 +22,7 @@ include_directories( ${WEBKIT_DIR}/UIProcess/API/gtk ) @@ -122,4 +122,4 @@ index 4aef695..a14b163 100644 +include_directories( ${GDK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} - ${GTK3_INCLUDE_DIRS} + ${GSTREAMER_INCLUDE_DIRS} |