summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch125
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch24
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch20
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/narrowing.patch31
4 files changed, 0 insertions, 200 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
deleted file mode 100644
index e71905d26a..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ /dev/null
@@ -1,125 +0,0 @@
1From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
5
6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using
8include_next which is sensitive to order of system header
9include paths. Its infact better to not tinker with the
10system header include paths at all. Since adding /usr/include
11to -system is redundant and compiler knows about it moreover
12now with gcc6 it interferes with compiler's functioning
13and ends up with compile errors e.g.
14
15/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18
19Upstream-Status: Pending
20
21---
22 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
23 Source/WebCore/PlatformGTK.cmake | 6 +++---
24 Source/WebKit/PlatformGTK.cmake | 2 +-
25 Source/cmake/WebKitMacros.cmake | 2 +-
26 Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
27 Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
28 6 files changed, 8 insertions(+), 8 deletions(-)
29
30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
31index 87153e35..cd0beed4 100644
32--- a/Source/JavaScriptCore/shell/CMakeLists.txt
33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
34@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
38-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
39+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
40 add_executable(jsc ${JSC_SOURCES})
41 target_link_libraries(jsc ${JSC_LIBRARIES})
42
43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
44index e0dd9cd9..a2997f3e 100644
45--- a/Source/WebCore/PlatformGTK.cmake
46+++ b/Source/WebCore/PlatformGTK.cmake
47@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
48 target_include_directories(WebCorePlatformGTK2 PRIVATE
49 ${WebCore_INCLUDE_DIRECTORIES}
50 )
51- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
52+ target_include_directories(WebCorePlatformGTK2 PRIVATE
53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
54 ${GTK2_INCLUDE_DIRS}
55 ${GDK2_INCLUDE_DIRS}
56@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
57 target_include_directories(WebCorePlatformGTK PRIVATE
58 ${WebCore_INCLUDE_DIRECTORIES}
59 )
60-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
61+target_include_directories(WebCorePlatformGTK PRIVATE
62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
63 ${GTK_INCLUDE_DIRS}
64 ${GDK_INCLUDE_DIRS}
65@@ -206,7 +206,7 @@ include_directories(
66 "${WEBCORE_DIR}/bindings/gobject/"
67 )
68
69-include_directories(SYSTEM
70+include_directories(
71 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
72 )
73
74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
75index 693bbdfe..20e3802f 100644
76--- a/Source/WebKit/PlatformGTK.cmake
77+++ b/Source/WebKit/PlatformGTK.cmake
78@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
79 target_include_directories(WebKitPluginProcess2 PRIVATE
80 ${WebKitCommonIncludeDirectories}
81 )
82- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
83+ target_include_directories(WebKitPluginProcess2 PRIVATE
84 ${WebKitCommonSystemIncludeDirectories}
85 ${GTK2_INCLUDE_DIRS}
86 ${GDK2_INCLUDE_DIRS}
87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
88index 6d58d57e..976e2362 100644
89--- a/Source/cmake/WebKitMacros.cmake
90+++ b/Source/cmake/WebKitMacros.cmake
91@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
92 ${${_target}_SOURCES}
93 )
94 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
95- target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
96+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
97 target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
98 target_link_libraries(${_target} ${${_target}_LIBRARIES})
99 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
101index a0d32059..f259ade2 100644
102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
104@@ -59,7 +59,7 @@ endif ()
105 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
106
107 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
108-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
109+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
110 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
112
113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
114index 8dd0e146..d037fc35 100644
115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
117@@ -22,7 +22,7 @@ include_directories(
118 ${WEBKIT_DIR}/UIProcess/API/gtk
119 )
120
121-include_directories(SYSTEM
122+include_directories(
123 ${GDK3_INCLUDE_DIRS}
124 ${GLIB_INCLUDE_DIRS}
125 ${GSTREAMER_INCLUDE_DIRS}
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch b/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
deleted file mode 100644
index bd4ac1e353..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 8 May 2019 15:31:23 +0200
4Subject: [PATCH] gstreamer: add a missing format string
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
13index e1e497ee..483fd65c 100644
14--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
15+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
16@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
17 WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
18
19 #if GST_CHECK_VERSION(1, 14, 0)
20- GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
21+ GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
22 #endif
23 switch (transition) {
24 case GST_STATE_CHANGE_READY_TO_NULL:
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
deleted file mode 100644
index 57ae48c141..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1From: Alberto Garcia <berto@igalia.com>
2Subject: Disable USE_GSTREAMER_GL is the package is not found
3Forwarded: no
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
8===================================================================
9--- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
10+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
11@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
12 message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
13 else ()
14 if (NOT PC_GSTREAMER_GL_FOUND)
15- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
16+ set(USE_GSTREAMER_GL OFF)
17+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
18 endif ()
19 endif ()
20 endif ()
diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
deleted file mode 100644
index 598b6b5df5..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Fix build with clang on arm where char is unsigned
2
3Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6--- a/Source/WebCore/contentextensions/DFACombiner.cpp
7+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
8@@ -37,7 +37,7 @@ namespace WebCore {
9 namespace ContentExtensions {
10
11 class DFAMerger {
12- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
13+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
14
15 enum class WhichDFA {
16 A,
17--- a/Source/WebCore/contentextensions/NFAToDFA.cpp
18+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
19@@ -41,9 +41,9 @@ namespace WebCore {
20
21 namespace ContentExtensions {
22
23-typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
24-typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
25-typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
26+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
27+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
28+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
29 typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
30 typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
31
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 04:54:10 +0000