From edf1e434942d3169c459eedaf1d7736ab51ac07a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 10:00:14 +0000 Subject: qtwebkit: add patches to meta-qt5 fork Signed-off-by: Martin Jansa --- ...001-Fix-build-with-non-glibc-libc-on-musl.patch | 69 ------- ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 207 --------------------- ...002-Fix-build-with-non-glibc-libc-on-musl.patch | 69 +++++++ ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 204 ++++++++++++++++++++ recipes-qt/qt5/qtwebkit_git.bb | 14 +- 5 files changed, 281 insertions(+), 282 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebkit/0001-Fix-build-with-non-glibc-libc-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch create mode 100644 recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch diff --git a/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-non-glibc-libc-on-musl.patch deleted file mode 100644 index 5cd604e5..00000000 --- a/recipes-qt/qt5/qtwebkit/0001-Fix-build-with-non-glibc-libc-on-musl.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 356ef55b985d8d874f2358b937d396bea52ebff6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 23 Aug 2018 04:06:17 +0000 -Subject: [PATCH] Fix build with non-glibc libc on musl - -Need to ensure glibc features are not assumed to be linux-wide - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - Source/JavaScriptCore/heap/MachineStackMarker.cpp | 8 ++++---- - .../inspector/JSGlobalObjectInspectorController.cpp | 2 ++ - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp -index 883914f..ce4e8d3 100644 ---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) && ENABLE(JIT) -+#elif defined(__linux__) && ENABLE(JIT) - - #if CPU(X86) - return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_ESP]); -@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp -index fd7f869..e95391b 100644 ---- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp -+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp -@@ -51,8 +51,10 @@ - #include - #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) - #include -+#if defined(__GLIBC__) - #include - #endif -+#endif - - #if ENABLE(REMOTE_INSPECTOR) - #include "JSGlobalObjectDebuggable.h" diff --git a/recipes-qt/qt5/qtwebkit/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/recipes-qt/qt5/qtwebkit/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted file mode 100644 index d96a6b65..00000000 --- a/recipes-qt/qt5/qtwebkit/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 7c2e6013caf7720530f963ca03eab2baa540c512 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 24 Aug 2018 07:13:39 +0000 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem - -gcc-6 has now introduced stdlib.h in libstdc++ for better -compliance and its including the C library stdlib.h using -include_next which is sensitive to order of system header -include paths. Its infact better to not tinker with the -system header include paths at all. Since adding /usr/include -to -system is redundant and compiler knows about it moreover -now with gcc6 it interferes with compiler's functioning -and ends up with compile errors e.g. - -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- - Source/WebKit/qt/declarative/CMakeLists.txt | 2 +- - Source/WebKit/qt/tests/CMakeLists.txt | 2 +- - Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt | 2 +- - Source/cmake/WebKitMacros.cmake | 2 +- - Tools/DumpRenderTree/CMakeLists.txt | 2 +- - Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- - Tools/ImageDiff/CMakeLists.txt | 2 +- - Tools/MiniBrowser/qt/CMakeLists.txt | 2 +- - Tools/QtTestBrowser/CMakeLists.txt | 2 +- - Tools/TestWebKitAPI/PlatformQt.cmake | 2 +- - Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +- - Tools/WebKitTestRunner/CMakeLists.txt | 2 +- - 13 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt -index 27d8133..9480f6d 100644 ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(jsc ${JSC_SOURCES}) - target_link_libraries(jsc ${JSC_LIBRARIES}) - set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") -diff --git a/Source/WebKit/qt/declarative/CMakeLists.txt b/Source/WebKit/qt/declarative/CMakeLists.txt -index e1ba22b..84cb565 100644 ---- a/Source/WebKit/qt/declarative/CMakeLists.txt -+++ b/Source/WebKit/qt/declarative/CMakeLists.txt -@@ -15,7 +15,7 @@ include_directories( - - ${WTF_DIR} - ) --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} -diff --git a/Source/WebKit/qt/tests/CMakeLists.txt b/Source/WebKit/qt/tests/CMakeLists.txt -index 3dc6af1..d821f02 100644 ---- a/Source/WebKit/qt/tests/CMakeLists.txt -+++ b/Source/WebKit/qt/tests/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories( - "${WEBKIT_DIR}/qt/WidgetApi" - ) - --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} -diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -index 210342e..bfc768f 100644 ---- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -+++ b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -@@ -4,7 +4,7 @@ include_directories( - "${WEBKIT_DIR}/qt/Api" - ) - --include_directories(SYSTEM -+include_directories( - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${Qt5QuickTest_INCLUDE_DIRS} -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 07e3143..a1e5887 100644 ---- a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -260,7 +260,7 @@ endmacro() - - macro(WEBKIT_FRAMEWORK _target) - include_directories(${${_target}_INCLUDE_DIRECTORIES}) -- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) -+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) - add_library(${_target} ${${_target}_LIBRARY_TYPE} - ${${_target}_HEADERS} - ${${_target}_SOURCES} -diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt -index 4a726cc..cd0c5e3 100644 ---- a/Tools/DumpRenderTree/CMakeLists.txt -+++ b/Tools/DumpRenderTree/CMakeLists.txt -@@ -115,7 +115,7 @@ list(APPEND TestNetscapePlugin_LIBRARIES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) - - add_executable(DumpRenderTree ${DumpRenderTree_SOURCES}) - target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES}) -diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -index c431667..6dff244 100644 ---- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES - ) - - include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) - - set(WebKitTestNetscapePlugin_LIBRARIES - ${X11_LIBRARIES} -diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt -index 6ce4ed5..4dd6c4a 100644 ---- a/Tools/ImageDiff/CMakeLists.txt -+++ b/Tools/ImageDiff/CMakeLists.txt -@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) - target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) - set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") -diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt -index 68dd13c..b491df2 100644 ---- a/Tools/MiniBrowser/qt/CMakeLists.txt -+++ b/Tools/MiniBrowser/qt/CMakeLists.txt -@@ -64,7 +64,7 @@ if (ENABLE_TEST_SUPPORT) - endif () - - include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(MiniBrowser ${MiniBrowser_SOURCES}) - target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) - set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) -diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt -index ccd8e0f..18de9f2 100644 ---- a/Tools/QtTestBrowser/CMakeLists.txt -+++ b/Tools/QtTestBrowser/CMakeLists.txt -@@ -62,7 +62,7 @@ if (ENABLE_TEST_SUPPORT) - endif () - - include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(QtTestBrowser ${QtTestBrowser_SOURCES}) - target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES}) - set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) -diff --git a/Tools/TestWebKitAPI/PlatformQt.cmake b/Tools/TestWebKitAPI/PlatformQt.cmake -index c054c66..046a91a 100644 ---- a/Tools/TestWebKitAPI/PlatformQt.cmake -+++ b/Tools/TestWebKitAPI/PlatformQt.cmake -@@ -7,7 +7,7 @@ include_directories( - ${TESTWEBKITAPI_DIR} - ) - --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Gui_INCLUDE_DIRS} - ) -diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -index b0b4739..434e4ca 100644 ---- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -@@ -23,7 +23,7 @@ include_directories( - ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk - ) - --include_directories(SYSTEM -+include_directories( - ${ATSPI_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt -index 6355772..6279658 100644 ---- a/Tools/WebKitTestRunner/CMakeLists.txt -+++ b/Tools/WebKitTestRunner/CMakeLists.txt -@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) - - add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) - target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) --- -1.9.1 - diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch new file mode 100644 index 00000000..dead46d1 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch @@ -0,0 +1,69 @@ +From 9db9a8850602c2446b1a7ee96608fd74cf56a342 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 23 Aug 2018 04:06:17 +0000 +Subject: [PATCH] Fix build with non-glibc libc on musl + +Need to ensure glibc features are not assumed to be linux-wide + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Source/JavaScriptCore/heap/MachineStackMarker.cpp | 8 ++++---- + .../inspector/JSGlobalObjectInspectorController.cpp | 2 ++ + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +index 883914fd3..ce4e8d331 100644 +--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) && ENABLE(JIT) ++#elif defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers::framePointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers::llintPC() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp +index fd7f869d4..e95391b32 100644 +--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp ++++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp +@@ -51,8 +51,10 @@ + #include + #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) + #include ++#if defined(__GLIBC__) + #include + #endif ++#endif + + #if ENABLE(REMOTE_INSPECTOR) + #include "JSGlobalObjectDebuggable.h" diff --git a/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch new file mode 100644 index 00000000..c24eb69e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -0,0 +1,204 @@ +From ef1b87e4ce8db720a4d7f5ee80fec4388dc3b086 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 24 Aug 2018 07:13:39 +0000 +Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem + +gcc-6 has now introduced stdlib.h in libstdc++ for better +compliance and its including the C library stdlib.h using +include_next which is sensitive to order of system header +include paths. Its infact better to not tinker with the +system header include paths at all. Since adding /usr/include +to -system is redundant and compiler knows about it moreover +now with gcc6 it interferes with compiler's functioning +and ends up with compile errors e.g. + +/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- + Source/WebKit/qt/declarative/CMakeLists.txt | 2 +- + Source/WebKit/qt/tests/CMakeLists.txt | 2 +- + Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt | 2 +- + Source/cmake/WebKitMacros.cmake | 2 +- + Tools/DumpRenderTree/CMakeLists.txt | 2 +- + Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- + Tools/ImageDiff/CMakeLists.txt | 2 +- + Tools/MiniBrowser/qt/CMakeLists.txt | 2 +- + Tools/QtTestBrowser/CMakeLists.txt | 2 +- + Tools/TestWebKitAPI/PlatformQt.cmake | 2 +- + Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +- + Tools/WebKitTestRunner/CMakeLists.txt | 2 +- + 13 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +index 27d81336f..9480f6d88 100644 +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) + include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(jsc ${JSC_SOURCES}) + target_link_libraries(jsc ${JSC_LIBRARIES}) + set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") +diff --git a/Source/WebKit/qt/declarative/CMakeLists.txt b/Source/WebKit/qt/declarative/CMakeLists.txt +index e1ba22bc1..84cb56544 100644 +--- a/Source/WebKit/qt/declarative/CMakeLists.txt ++++ b/Source/WebKit/qt/declarative/CMakeLists.txt +@@ -15,7 +15,7 @@ include_directories( + + ${WTF_DIR} + ) +-include_directories(SYSTEM ++include_directories( + ${ICU_INCLUDE_DIRS} + ${Qt5Quick_INCLUDE_DIRS} + ${Qt5Quick_PRIVATE_INCLUDE_DIRS} +diff --git a/Source/WebKit/qt/tests/CMakeLists.txt b/Source/WebKit/qt/tests/CMakeLists.txt +index 3dc6af1d5..d821f0284 100644 +--- a/Source/WebKit/qt/tests/CMakeLists.txt ++++ b/Source/WebKit/qt/tests/CMakeLists.txt +@@ -7,7 +7,7 @@ include_directories( + "${WEBKIT_DIR}/qt/WidgetApi" + ) + +-include_directories(SYSTEM ++include_directories( + ${ICU_INCLUDE_DIRS} + ${Qt5Gui_PRIVATE_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} +diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt +index 210342ef5..bfc768fa0 100644 +--- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt ++++ b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + "${WEBKIT_DIR}/qt/Api" + ) + +-include_directories(SYSTEM ++include_directories( + ${Qt5Quick_INCLUDE_DIRS} + ${Qt5Quick_PRIVATE_INCLUDE_DIRS} + ${Qt5QuickTest_INCLUDE_DIRS} +diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake +index 07e31432a..a1e58873f 100644 +--- a/Source/cmake/WebKitMacros.cmake ++++ b/Source/cmake/WebKitMacros.cmake +@@ -260,7 +260,7 @@ endmacro() + + macro(WEBKIT_FRAMEWORK _target) + include_directories(${${_target}_INCLUDE_DIRECTORIES}) +- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) ++ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) + add_library(${_target} ${${_target}_LIBRARY_TYPE} + ${${_target}_HEADERS} + ${${_target}_SOURCES} +diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt +index 4a726ccaf..cd0c5e303 100644 +--- a/Tools/DumpRenderTree/CMakeLists.txt ++++ b/Tools/DumpRenderTree/CMakeLists.txt +@@ -115,7 +115,7 @@ list(APPEND TestNetscapePlugin_LIBRARIES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) + + add_executable(DumpRenderTree ${DumpRenderTree_SOURCES}) + target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES}) +diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +index c431667b2..6dff24475 100644 +--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt ++++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES + ) + + include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) + + set(WebKitTestNetscapePlugin_LIBRARIES + ${X11_LIBRARIES} +diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt +index 6ce4ed522..4dd6c4adf 100644 +--- a/Tools/ImageDiff/CMakeLists.txt ++++ b/Tools/ImageDiff/CMakeLists.txt +@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) + target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) + set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") +diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt +index 68dd13c8b..b491df2a8 100644 +--- a/Tools/MiniBrowser/qt/CMakeLists.txt ++++ b/Tools/MiniBrowser/qt/CMakeLists.txt +@@ -64,7 +64,7 @@ if (ENABLE_TEST_SUPPORT) + endif () + + include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(MiniBrowser ${MiniBrowser_SOURCES}) + target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) + set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) +diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt +index ccd8e0ff2..18de9f274 100644 +--- a/Tools/QtTestBrowser/CMakeLists.txt ++++ b/Tools/QtTestBrowser/CMakeLists.txt +@@ -62,7 +62,7 @@ if (ENABLE_TEST_SUPPORT) + endif () + + include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(QtTestBrowser ${QtTestBrowser_SOURCES}) + target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES}) + set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) +diff --git a/Tools/TestWebKitAPI/PlatformQt.cmake b/Tools/TestWebKitAPI/PlatformQt.cmake +index c054c661b..046a91abc 100644 +--- a/Tools/TestWebKitAPI/PlatformQt.cmake ++++ b/Tools/TestWebKitAPI/PlatformQt.cmake +@@ -7,7 +7,7 @@ include_directories( + ${TESTWEBKITAPI_DIR} + ) + +-include_directories(SYSTEM ++include_directories( + ${ICU_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ) +diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt +index b0b473962..434e4ca25 100644 +--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt ++++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt +@@ -23,7 +23,7 @@ include_directories( + ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk + ) + +-include_directories(SYSTEM ++include_directories( + ${ATSPI_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} + ${GSTREAMER_INCLUDE_DIRS} +diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt +index 6355772ce..627965858 100644 +--- a/Tools/WebKitTestRunner/CMakeLists.txt ++++ b/Tools/WebKitTestRunner/CMakeLists.txt +@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) + + add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) + target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 3a573e6d..8714d18f 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,12 +1,6 @@ require qt5.inc require qt5-git.inc -SRC_URI += "\ - file://0001-Do-not-skip-build-for-cross-compile.patch \ - file://0001-Fix-build-with-non-glibc-libc-on-musl.patch \ - file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ -" - LICENSE = "BSD & LGPLv2+ | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ @@ -15,6 +9,14 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native" +# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.11 +# 5.11.meta-qt5.1 +SRC_URI += "\ + file://0001-Do-not-skip-build-for-cross-compile.patch \ + file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ + file://0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ +" + inherit cmake_qt5 perlnative pythonnative # qemuarm build fails with: -- cgit v1.2.3