Mercurial > vanilla

comparison www/webkitgtk/patch-isystem.patch @ 743:a6ccd21107cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
www/webkit: initial import, closes #1752
author David Demelier <markand@malikania.fr>
date Wed, 07 Aug 2019 07:13:31 +0200
parents
children
comparison
equal deleted inserted replaced
742:aa3c1de1780a 743:a6ccd21107cb
1 --- ./Tools/MiniBrowser/gtk/CMakeLists.txt.orig 2019-08-05 09:37:14.540345025 +0200
2 +++ ./Tools/MiniBrowser/gtk/CMakeLists.txt 2019-08-05 09:37:25.348345357 +0200
3 @@ -59,7 +59,7 @@
4 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
5
6 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
7 -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
8 +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
9 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
10 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
11
12 --- ./Tools/TestWebKitAPI/glib/CMakeLists.txt.orig 2019-08-05 09:37:35.632345673 +0200
13 +++ ./Tools/TestWebKitAPI/glib/CMakeLists.txt 2019-08-05 09:37:49.932346112 +0200
14 @@ -95,7 +95,7 @@
15 )
16
17 include_directories(${WebKitGLibAPITests_INCLUDE_DIRECTORIES})
18 -include_directories(SYSTEM ${WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES})
19 +include_directories(${WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES})
20
21 add_library(WebKitGLibAPITestsCore STATIC ${WebKitGLibAPITests_SOURCES})
22 target_link_libraries(WebKitGLibAPITestsCore WebKit)
23 @@ -161,7 +161,7 @@
24 )
25 target_compile_definitions(${test_name} PUBLIC QT_NO_KEYWORDS=1)
26 target_link_libraries(${test_name} ${WPEQtAPITest_LIBRARIES})
27 - target_include_directories(${test_name} SYSTEM PRIVATE ${WPEQtAPITests_INCLUDE_DIRECTORIES})
28 + target_include_directories(${test_name} PRIVATE ${WPEQtAPITests_INCLUDE_DIRECTORIES})
29 target_include_directories(${test_name} PRIVATE
30 ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/qt)
31 endmacro()
32 --- ./Tools/TestWebKitAPI/PlatformJSCOnly.cmake.orig 2019-08-05 09:30:13.544332093 +0200
33 +++ ./Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2019-08-05 09:30:20.548332308 +0200
34 @@ -6,7 +6,7 @@
35 )
36
37 if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
38 - include_directories(SYSTEM
39 + include_directories(
40 ${GLIB_INCLUDE_DIRS}
41 )
42 list(APPEND TestWTF_SOURCES
43 --- ./Tools/TestWebKitAPI/PlatformGTK.cmake.orig 2019-08-05 09:29:47.984331308 +0200
44 +++ ./Tools/TestWebKitAPI/PlatformGTK.cmake 2019-08-05 09:29:57.020331585 +0200
45 @@ -22,7 +22,7 @@
46 ${WEBKIT_DIR}/UIProcess/API/gtk
47 )
48
49 -include_directories(SYSTEM
50 +include_directories(
51 ${GDK3_INCLUDE_DIRS}
52 ${GLIB_INCLUDE_DIRS}
53 ${GSTREAMER_INCLUDE_DIRS}
54 --- ./Source/WebDriver/CMakeLists.txt.orig 2019-08-05 09:37:59.296346400 +0200
55 +++ ./Source/WebDriver/CMakeLists.txt 2019-08-05 09:38:05.940346604 +0200
56 @@ -42,7 +42,7 @@
57 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
58
59 include_directories(${WebDriver_INCLUDE_DIRECTORIES})
60 -include_directories(SYSTEM ${WebDriver_SYSTEM_INCLUDE_DIRECTORIES})
61 +include_directories(${WebDriver_SYSTEM_INCLUDE_DIRECTORIES})
62 add_executable(WebDriver ${WebDriver_SOURCES})
63 target_link_libraries(WebDriver ${WebDriver_LIBRARIES})
64
65 --- ./Source/WebKit/PlatformGTK.cmake.orig 2019-08-05 09:33:16.360337709 +0200
66 +++ ./Source/WebKit/PlatformGTK.cmake 2019-08-05 09:33:41.168338471 +0200
67 @@ -665,7 +665,7 @@
68 target_include_directories(WebKitPluginProcess2 PRIVATE
69 ${WebKitCommonIncludeDirectories}
70 )
71 - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
72 + target_include_directories(WebKitPluginProcess2 PRIVATE
73 ${WebKitCommonSystemIncludeDirectories}
74 ${GTK2_INCLUDE_DIRS}
75 ${GDK2_INCLUDE_DIRS}
76 @@ -705,7 +705,7 @@
77 "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
78 )
79
80 -target_include_directories(webkit2gtkinjectedbundle SYSTEM PRIVATE
81 +target_include_directories(webkit2gtkinjectedbundle PRIVATE
82 ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}
83 )
84
85 --- ./Source/cmake/WebKitMacros.cmake.orig 2019-08-05 09:35:29.196341789 +0200
86 +++ ./Source/cmake/WebKitMacros.cmake 2019-08-05 09:35:38.300342069 +0200
87 @@ -152,7 +152,7 @@
88 ${${_target}_SOURCES}
89 )
90 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
91 - target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
92 + target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
93 target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
94 target_link_libraries(${_target} ${${_target}_LIBRARIES})
95 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
96 --- ./Source/cmake/WebKitCompilerFlags.cmake.orig 2019-08-05 09:34:01.300339089 +0200
97 +++ ./Source/cmake/WebKitCompilerFlags.cmake 2019-08-05 09:35:19.180341481 +0200
98 @@ -216,31 +216,6 @@
99 set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}")
100 set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS}")
101
102 -
103 -# Ensure that the default include system directories are added to the list of CMake implicit includes.
104 -# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem).
105 -# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697
106 -macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result)
107 - file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n")
108 - separate_arguments(_buildFlags UNIX_COMMAND "${_flags}")
109 - execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy
110 - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET
111 - ERROR_VARIABLE _gccOutput)
112 - file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
113 - if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list")
114 - set(${_result} ${CMAKE_MATCH_1})
115 - string(REPLACE "\n" " " ${_result} "${${_result}}")
116 - separate_arguments(${_result})
117 - endif ()
118 -endmacro()
119 -
120 -if (COMPILER_IS_GCC_OR_CLANG)
121 - DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS)
122 - set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
123 - DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS)
124 - set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
125 -endif ()
126 -
127 if (COMPILER_IS_GCC_OR_CLANG)
128 set(ATOMIC_TEST_SOURCE "
129 #include <atomic>
130 --- ./Source/JavaScriptCore/CMakeLists.txt.orig 2019-08-05 09:39:00.468348279 +0200
131 +++ ./Source/JavaScriptCore/CMakeLists.txt 2019-08-05 09:39:08.728348533 +0200
132 @@ -1283,13 +1283,13 @@
133 ${JavaScriptCore_INCLUDE_DIRECTORIES}
134 ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
135 )
136 -target_include_directories(LLIntSettingsExtractor SYSTEM PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
137 +target_include_directories(LLIntSettingsExtractor PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
138
139 target_include_directories(LLIntOffsetsExtractor PRIVATE
140 ${JavaScriptCore_INCLUDE_DIRECTORIES}
141 ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
142 )
143 -target_include_directories(LLIntOffsetsExtractor SYSTEM PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
144 +target_include_directories(LLIntOffsetsExtractor PRIVATE ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
145
146 add_subdirectory(shell)
147
148 --- ./Source/JavaScriptCore/shell/CMakeLists.txt.orig 2019-08-05 09:38:28.744347304 +0200
149 +++ ./Source/JavaScriptCore/shell/CMakeLists.txt 2019-08-05 09:38:34.484347481 +0200
150 @@ -36,7 +36,7 @@
151 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
152 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
153 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
154 -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
155 +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
156 add_executable(jsc ${JSC_SOURCES})
157 target_link_libraries(jsc ${JSC_LIBRARIES})
158
159 --- ./Source/WebCore/CMakeLists.txt.orig 2019-08-05 09:39:20.148348883 +0200
160 +++ ./Source/WebCore/CMakeLists.txt 2019-08-05 09:39:43.724349608 +0200
161 @@ -2104,7 +2104,7 @@
162 # paths of WebCore.
163 add_library(WebCoreHeaderInterface INTERFACE)
164 target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_INCLUDE_DIRECTORIES})
165 -target_include_directories(WebCoreHeaderInterface SYSTEM INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
166 +target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
167 target_link_libraries(WebCoreHeaderInterface INTERFACE ${WebCore_LIBRARIES})
168
169 if (MSVC)
170 @@ -2114,7 +2114,7 @@
171 add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
172 add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
173 target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
174 -target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
175 +target_include_directories(WebCoreTestSupport PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
176 target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
177
178 if (WebCoreTestSupport_OUTPUT_NAME)
179 --- ./Source/WebCore/PlatformGTK.cmake.orig 2019-08-05 09:35:55.792342606 +0200
180 +++ ./Source/WebCore/PlatformGTK.cmake 2019-08-05 09:36:19.120343323 +0200
181 @@ -164,7 +164,7 @@
182 target_include_directories(WebCorePlatformGTK2 PRIVATE
183 ${WebCore_INCLUDE_DIRECTORIES}
184 )
185 - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
186 + target_include_directories(WebCorePlatformGTK2 PRIVATE
187 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
188 ${GTK2_INCLUDE_DIRS}
189 ${GDK2_INCLUDE_DIRS}
190 @@ -190,7 +190,7 @@
191 target_include_directories(WebCorePlatformGTK PRIVATE
192 ${WebCore_INCLUDE_DIRECTORIES}
193 )
194 -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
195 +target_include_directories(WebCorePlatformGTK PRIVATE
196 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
197 ${GTK_INCLUDE_DIRS}
198 ${GDK_INCLUDE_DIRS}
199 @@ -206,7 +206,7 @@
200 "${WEBCORE_DIR}/bindings/gobject/"
201 )
202
203 -include_directories(SYSTEM
204 +include_directories(
205 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
206 )
207