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-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch73
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch42
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch38
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch75
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch46
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch47
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch52
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch67
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/include_array.patch15
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/include_xutil.patch24
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch30
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/reproducibility.patch30
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch37
13 files changed, 257 insertions, 319 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch
new file mode 100644
index 0000000000..a819e22127
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch
@@ -0,0 +1,73 @@
1From 575b848a3b3c14280679db80d0d518922c83d62a Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 11 Aug 2023 14:20:48 +0800
4Subject: [PATCH] Add a variable to control macro
5 __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
6 https://bugs.webkit.org/show_bug.cgi?id=260065
7
8Reviewed by NOBODY (OOPS!).
9
10It fails to compile webkitgtk with option `-Og` of gcc/g++:
11
12| In file included from Source/bmalloc/libpas/src/libpas/pas_heap_page_provider.h:30,
13| from Source/bmalloc/libpas/src/libpas/pas_bootstrap_heap_page_provider.h:29,
14| from Source/bmalloc/libpas/src/libpas/pas_large_heap_physical_page_sharing_cache.h:29,
15| from Source/bmalloc/libpas/src/libpas/pas_basic_heap_page_caches.h:29,
16| from Source/bmalloc/libpas/src/libpas/pas_heap_config_utils.h:32,
17| from Source/bmalloc/libpas/src/libpas/bmalloc_heap_config.h:34,
18| from Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:34,
19| from Source/bmalloc/bmalloc/bmalloc.h:39,
20| from Source/bmalloc/bmalloc/bmalloc.cpp:26:
21| In function 'pas_allocation_result pas_local_allocator_try_allocate(pas_local_allocator*, size_t, size_t, pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter)',
22| inlined from 'pas_allocation_result pas_try_allocate_common_impl_fast(pas_heap_config, pas_allocator_counts*, pas_allocation_result_filter, pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_common.h:85:46,
23| inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_impl_fast(pas_local_allocator*, size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1,
24| inlined from 'pas_allocation_result pas_try_allocate_intrinsic_impl_casual_case(__pas_heap*, size_t, size_t, pas_intrinsic_heap_support*, pas_heap_config, pas_try_allocate_common_fast, pas_try_allocate_common_slow, pas_intrinsic_heap_designation_mode)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_try_allocate_intrinsic.h:167:44,
25| inlined from 'pas_allocation_result bmalloc_try_allocate_with_alignment_impl_casual_case(size_t, size_t)' at webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/bmalloc_heap_inlines.h:59:1:
26| webkitgtk-2.40.2/Source/bmalloc/libpas/src/libpas/pas_allocation_result.h:76:1: error: inlining failed in call to 'always_inline' 'pas_allocation_result pas_allocation_result_identity(pas_allocation_result)': function not considered for inlining
27| 76 | pas_allocation_result_identity(pas_allocation_result result)
28| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
29
30Add an variable `WEBKIT_NO_INLINE_HINTS` to control macro
31__PAS_ALWAYS_INLINE_BUT_NOT_INLINE whether includes function attribute
32`always_inline`. It could set the variable to make compilation pass when
33gcc option `-Og` is used.
34
35* Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h:
36* Source/cmake/WebKitCompilerFlags.cmake:
37
38Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/16601]
39
40Signed-off-by: Kai Kang <kai.kang@windriver.com>
41---
42 Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | 2 +-
43 Source/cmake/WebKitCompilerFlags.cmake | 7 +++++++
44 2 files changed, 8 insertions(+), 1 deletion(-)
45
46diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
47index 5d5fb38c..a554f700 100644
48--- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
49+++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
50@@ -44,7 +44,7 @@ __PAS_BEGIN_EXTERN_C;
51 #define __SUSPICIOUS__
52 #define __BROKEN__
53
54-#ifdef __OPTIMIZE__
55+#if defined(__OPTIMIZE__) && !defined(WEBKIT_NO_INLINE_HINTS)
56 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE __attribute__((__always_inline__))
57 #else
58 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
59diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
60index 9b2fecf9..7cdc2b6a 100644
61--- a/Source/cmake/WebKitCompilerFlags.cmake
62+++ b/Source/cmake/WebKitCompilerFlags.cmake
63@@ -453,3 +453,10 @@ endif ()
64
65 # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
66 set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
67+
68+# It fails to compile with `gcc -Og`
69+set(WEBKIT_NO_INLINE_HINTS OFF CACHE BOOL "Disable funtion attribute always_inline for WebKit")
70+
71+if (WEBKIT_NO_INLINE_HINTS)
72+ add_definitions(-DWEBKIT_NO_INLINE_HINTS)
73+endif ()
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
deleted file mode 100644
index ca7b1bca48..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From b145ab4273c59f4f908cdaff9e267241bd970e93 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 3 Feb 2020 17:06:27 -0800
4Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
5
6Fixes build failures on risv64
7
8Taken from https://trac.webkit.org/changeset/231843/webkit
9
10 Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of
11-lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to
12missing atomic primitives.
13
14Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
17---
18 Source/cmake/OptionsGTK.cmake | 1 +
19 Source/cmake/OptionsJSCOnly.cmake | 1 +
20 2 files changed, 2 insertions(+)
21
22diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
23index 8732e935..9b4fbae7 100644
24--- a/Source/cmake/OptionsGTK.cmake
25+++ b/Source/cmake/OptionsGTK.cmake
26@@ -32,6 +32,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
27 if (USER_AGENT_BRANDING)
28 add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}")
29 endif ()
30+set(THREADS_PREFER_PTHREAD_FLAG ON)
31
32 find_package(Cairo 1.14.0 REQUIRED)
33 find_package(Fontconfig 2.8.0 REQUIRED)
34diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
35index 316c6240..2f712602 100644
36--- a/Source/cmake/OptionsJSCOnly.cmake
37+++ b/Source/cmake/OptionsJSCOnly.cmake
38@@ -1,3 +1,4 @@
39+set(THREADS_PREFER_PTHREAD_FLAG ON)
40 find_package(Threads REQUIRED)
41
42 if (MSVC)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index fae3b0b2e5..8e29ce17ed 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
@@ -1,27 +1,29 @@
1From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 1From 6348f91c29e2350ad3fec5264aa57dd4994d4583 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:02:19 +0200 3Date: Tue, 27 Oct 2015 16:02:19 +0200
4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained 4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
5 from pkg-config with PKG_CONFIG_SYSROOT_DIR 5 from pkg-config with PKG_CONFIG_SYSROOT_DIR
6 6
7Upstream-Status: Pending [review on oe-core list] 7See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
8reasons why this is not approproiate for upstream submission.
9
10Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9--- 12---
10 Source/cmake/FindGObjectIntrospection.cmake | 1 + 13 Source/cmake/FindGI.cmake | 3 +++
11 1 file changed, 1 insertion(+) 14 1 file changed, 3 insertions(+)
12 15
13diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake 16diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
14index e1f49b4..03a4446 100644 17index fdc56b21..d42eca52 100644
15--- a/Source/cmake/FindGObjectIntrospection.cmake 18--- a/Source/cmake/FindGI.cmake
16+++ b/Source/cmake/FindGObjectIntrospection.cmake 19+++ b/Source/cmake/FindGI.cmake
17@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) 20@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
18 else ()
19 string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
20 string(REGEX REPLACE " +$" "" _result "${_result}")
21+ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}")
22 separate_arguments(_result)
23 set(${_outvar} ${_result} CACHE INTERNAL "")
24 endif () 21 endif ()
25-- 22 endif ()
262.1.4 23
27 24+set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}")
25+set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}")
26+
27 find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner)
28 find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler)
29
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
deleted file mode 100644
index 6dcb52956c..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From 828a500d5be62ba6fc94bd4fac3fe4bf1b1d4f6d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
11 Source/WTF/wtf/PlatformHave.h | 2 +-
12 2 files changed, 6 insertions(+), 6 deletions(-)
13
14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
15index c5052527..95ef98b5 100644
16--- a/Source/JavaScriptCore/runtime/MachineContext.h
17+++ b/Source/JavaScriptCore/runtime/MachineContext.h
18@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
19 #error Unknown Architecture
20 #endif
21
22-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
23+#elif defined(__linux__)
24
25 #if CPU(X86)
26 return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
27@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
28 #error Unknown Architecture
29 #endif
30
31-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
32+#elif defined(__linux__)
33
34 // The following sequence depends on glibc's sys/ucontext.h.
35 #if CPU(X86)
36@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
37 #error Unknown Architecture
38 #endif
39
40-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
41+#elif defined(__linux__)
42
43 // The following sequence depends on glibc's sys/ucontext.h.
44 #if CPU(X86)
45@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
46 #error Unknown Architecture
47 #endif
48
49-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
50+#elif defined(__linux__)
51
52 // The following sequence depends on glibc's sys/ucontext.h.
53 #if CPU(X86)
54@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
55 #error Unknown Architecture
56 #endif
57
58-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
59+#elif defined(__linux__)
60
61 // The following sequence depends on glibc's sys/ucontext.h.
62 #if CPU(X86)
63diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
64index daca20fe..53eae6ba 100644
65--- a/Source/WTF/wtf/PlatformHave.h
66+++ b/Source/WTF/wtf/PlatformHave.h
67@@ -222,7 +222,7 @@
68 #define HAVE_HOSTED_CORE_ANIMATION 1
69 #endif
70
71-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
72+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
73 #define HAVE_MACHINE_CONTEXT 1
74 #endif
75
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
deleted file mode 100644
index 0c31c5fa21..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Aug 2016 16:38:11 +0300
4Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 Source/WebKit/PlatformGTK.cmake | 9 +++++----
11 1 file changed, 5 insertions(+), 4 deletions(-)
12
13diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
14index a069c5f6..ea2f542b 100644
15--- a/Source/WebKit/PlatformGTK.cmake
16+++ b/Source/WebKit/PlatformGTK.cmake
17@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
18 set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
19 endif ()
20
21- add_custom_command(
22- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
23+ # This is a target and not a command because it's used to build another .gir
24+ # and a .typelib, which would trigger two racy parallel builds when using command
25+ add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
26 DEPENDS WebKit
27 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
28 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
29@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION)
30 add_custom_command(
31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
33- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
34+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
35 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
38@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
39
40 add_custom_command(
41 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
42- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
43+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
44 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
45 )
46
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
deleted file mode 100644
index 866e9d9d09..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 1c7e7a385387d7febf633bbb6d2b99ece523e719 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
5 OpenEmbedded build system
6
7This requires setting a few environment variables so that the transient
8binary is build and linked correctly, and disabling the tweaks to RUN
9variable from gtkdoc.py script so that our qemu wrapper is taken into use.
10
11Upstream-Status: Inappropriate [oe-specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
14---
15 Source/cmake/GtkDoc.cmake | 2 +-
16 Tools/gtkdoc/gtkdoc.py | 4 ++--
17 2 files changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20index 18e86448..102c873a 100644
21--- a/Source/cmake/GtkDoc.cmake
22+++ b/Source/cmake/GtkDoc.cmake
23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies}
27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
29 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM
32diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33index 054cafa1..416de7d1 100644
34--- a/Tools/gtkdoc/gtkdoc.py
35+++ b/Tools/gtkdoc/gtkdoc.py
36@@ -320,9 +320,9 @@ class GTKDoc(object):
37 additional_ldflags = '%s %s' % (additional_ldflags, arg)
38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
40- if current_ld_library_path:
41+ if current_ld_library_path and 'RUN' not in env:
42 env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
43- else:
44+ elif 'RUN' not in env:
45 env['LD_LIBRARY_PATH'] = self.library_path
46
47 if ldflags:
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
deleted file mode 100644
index 3e03aa968c..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Oct 2015 14:18:57 +0200
4Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
5 compiler flags.
6
7g-ir-compiler is using a C compiler internally, so it needs to set
8the proper flags for it.
9
10Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 Source/JavaScriptCore/PlatformGTK.cmake | 2 +-
15 Source/WebKit/PlatformGTK.cmake | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
19index 0b2968d2..2742ad80 100644
20--- a/Source/JavaScriptCore/PlatformGTK.cmake
21+++ b/Source/JavaScriptCore/PlatformGTK.cmake
22@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
23 add_custom_command(
24 OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
25 DEPENDS JavaScriptCore
26- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
27+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
28 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
29 ${INTROSPECTION_SCANNER}
30 --quiet
31diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
32index e36e4c35..943f9794 100644
33--- a/Source/WebKit/PlatformGTK.cmake
34+++ b/Source/WebKit/PlatformGTK.cmake
35@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION)
36 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
37 DEPENDS WebKit
38 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
39- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
40+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
41 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
42 ${INTROSPECTION_SCANNER}
43 --quiet
44@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION)
45 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
46 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
47 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
48- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
49+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
50 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
51 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
52 ${INTROSPECTION_SCANNER}
diff --git a/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
new file mode 100644
index 0000000000..76bcb3df99
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
@@ -0,0 +1,67 @@
1From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001
2From: Thomas Devoogdt <thomas.devoogdt@barco.com>
3Date: Mon, 16 Jan 2023 17:03:30 +0100
4Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
5
6 !ENABLE(WEBASSEMBLY_B3JIT)
7
8https://bugs.webkit.org/show_bug.cgi?id=250681
9
10Reviewed by NOBODY (OOPS!).
11
12WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
13Also, toB3Type and simdScalarType are not defined if it is included.
14
15Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
16
17Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798]
18
19Signed-off-by: Markus Volk <f_l_k@t-online.de>
20---
21 Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
22 1 file changed, 9 insertions(+), 3 deletions(-)
23
24diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
25index eaaa3749..1d089783 100644
26--- a/Source/JavaScriptCore/b3/B3Validate.cpp
27+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
28@@ -47,6 +47,12 @@
29 #include <wtf/StringPrintStream.h>
30 #include <wtf/text/CString.h>
31
32+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
33+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
34+#else
35+#define simdScalarTypeToB3Type(type) B3::Type()
36+#endif
37+
38 namespace JSC { namespace B3 {
39
40 namespace {
41@@ -454,7 +460,7 @@ public:
42 case VectorExtractLane:
43 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
44 VALIDATE(value->numChildren() == 1, ("At ", *value));
45- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
46+ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
47 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
48 break;
49 case VectorReplaceLane:
50@@ -462,7 +468,7 @@ public:
51 VALIDATE(value->numChildren() == 2, ("At ", *value));
52 VALIDATE(value->type() == V128, ("At ", *value));
53 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
54- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
55+ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
56 break;
57 case VectorDupElement:
58 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
59@@ -484,7 +490,7 @@ public:
60 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
61 VALIDATE(value->numChildren() == 1, ("At ", *value));
62 VALIDATE(value->type() == V128, ("At ", *value));
63- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
64+ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
65 break;
66
67 case VectorPopcnt:
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_array.patch b/meta/recipes-sato/webkit/webkitgtk/include_array.patch
deleted file mode 100644
index 7268b04bf4..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/include_array.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Added missing include for std::array
2
3Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085]
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6--- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700
7+++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700
8@@ -31,6 +31,7 @@
9 #include <elf.h>
10 #include <fcntl.h>
11 #include <mutex>
12+#include <array>
13 #include <sys/mman.h>
14 #include <sys/stat.h>
15 #include <sys/syscall.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
deleted file mode 100644
index f770b381ce..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Since
2https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4
3it uses XVisualInfo which is defined in Xutil.h
4
5Without this the build fails with:
6webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'?
7 132 | XVisualInfo visualTemplate;
8 | ^~~~~~~~~~~
9 | VisualID
10
11Upstream-Status: Pending
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13
14diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
15--- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000
16+++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000
17@@ -30,6 +30,7 @@
18
19 #if PLATFORM(X11)
20 #include <X11/Xlib.h>
21+#include <X11/Xutil.h>
22 #include <X11/extensions/Xcomposite.h>
23 #if PLATFORM(GTK)
24 #include <X11/extensions/Xdamage.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch
new file mode 100644
index 0000000000..8ce37a01cc
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch
@@ -0,0 +1,30 @@
1From a9c874f7418cefbe78f7cd26505ae495cb59bbcf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 12 Jan 2024 09:21:39 -0800
4Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
5
6This causes clang-17 to crash see [1]
7this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit
8
9[1] https://github.com/llvm/llvm-project/issues/67767
10[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35
11
12Upstream-Status: Inappropriate [work around to avoid clang compiler crash]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Source/WTF/wtf/Compiler.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
19index 0ea5cb76..c5480dbc 100644
20--- a/Source/WTF/wtf/Compiler.h
21+++ b/Source/WTF/wtf/Compiler.h
22@@ -284,7 +284,7 @@
23 /* MUST_TAIL_CALL */
24
25 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
26-#if __has_cpp_attribute(clang::musttail)
27+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__)
28 #define MUST_TAIL_CALL [[clang::musttail]]
29 #endif
30 #endif
diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
new file mode 100644
index 0000000000..93a431a0b1
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
@@ -0,0 +1,30 @@
1From d096b945113ddecaf33062296e20b6d5a007cab3 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Mon, 3 Jan 2022 14:18:34 +0000
4Subject: [PATCH] webkitgtk: Add reproducibility fix
5
6Injection a year based on the current date isn't reproducible. Hack this
7to a specific year for now for reproducibilty and to avoid autobuilder failures.
8
9The correct fix would be to use SOURCE_DATE_EPOCH from the environment and
10then this could be submitted upstream, sadly my ruby isn't up to that.
11
12Upstream-Status: Pending [could be reworked]
13Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14---
15 Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb
19index 6ed2b6e4..86a28286 100644
20--- a/Source/JavaScriptCore/generator/GeneratedFile.rb
21+++ b/Source/JavaScriptCore/generator/GeneratedFile.rb
22@@ -25,7 +25,7 @@ require 'date'
23 require 'digest'
24
25 $LICENSE = <<-EOF
26-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved.
27+Copyright (C) 2021 Apple Inc. All rights reserved.
28
29 Redistribution and use in source and binary forms, with or without
30 modification, are permitted provided that the following conditions
diff --git a/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
new file mode 100644
index 0000000000..d4720e4f28
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
@@ -0,0 +1,37 @@
1From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001
2From: Michael Catanzaro <mcatanzaro@redhat.com>
3Date: Mon, 5 Feb 2024 11:00:49 -0600
4Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?=
5 =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?=
6 =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?=
7 =?UTF-8?q?=3D268739?=
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Unreviewed build fix. Seems a backport went badly, and we didn't notice
13because the code is architecture-specific.
14
15* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
16(JSC::CLoop::execute):
17
18Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff]
19Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
20---
21 Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
22 1 file changed, 2 deletions(-)
23
24diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
25index 5064ead6cd2e7..9a2e2653b1219 100644
26--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
27+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
28@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
29 UNUSED_VARIABLE(t2);
30 UNUSED_VARIABLE(t3);
31 UNUSED_VARIABLE(t5);
32- UNUSED_VARIABLE(t6);
33- UNUSED_VARIABLE(t7);
34
35 struct StackPointerScope {
36 StackPointerScope(CLoopStack& stack)
37
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 23:55:37 +0000