diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-11 18:16:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-14 11:09:46 +0000 |
commit | 165b337dfe00fd460c62d2e15a8a2c5613bb326c (patch) | |
tree | abddf4a2987d46a88b9b4b25739c0845724f2ff2 /meta | |
parent | 99641c56ebdb1bb5f63de7bb9bdf09374658b0ac (diff) | |
download | poky-165b337dfe00fd460c62d2e15a8a2c5613bb326c.tar.gz |
webkitgtk: update to 2.18.5 (includes Spectre mitigations; see commit description)
This is the only available stable version with mitigation fixes for Spectre.
Webkit upstream developers do not port CVE fixes to earlier stable series,
no exception was made in this case.
More information:
https://webkit.org/blog/8048/what-spectre-and-meltdown-mean-for-webkit/
https://webkitgtk.org/security/WSA-2018-0001.html
https://webkitgtk.org/2018/01/10/webkitgtk2.18.5-released.html
This commit also contains the following commits added in master branch after rocko release:
===
webkitgtk: update to 2.18.3
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no
longer present in upstream tree. However, a patch with different musl fixes
has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Disable Gstreamer GL support on x86 due to clashing headers problem.
(From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec)
===
webkitgtk: fix build with musl and x32
Make the x32 check generic to make it work with musl as well.
Fixes [YOCTO #12118]
(From OE-Core rev: dbd604ccf34e304769937b15051c047561de47f7)
===
(From OE-Core rev: 78f29a052477dd81f0819287e3db405932bb7fae)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | 77 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 23 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | 25 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | 182 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 24 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.18.5.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.16.6.bb) | 16 |
10 files changed, 213 insertions, 257 deletions
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 new file mode 100644 index 0000000000..7cc4514fcc --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 | ||
4 | Subject: [PATCH] Fix build with musl | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- | ||
10 | Source/WTF/wtf/Platform.h | 2 +- | ||
11 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
12 | |||
13 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | ||
14 | index 95080b9..2bb689c 100644 | ||
15 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | ||
16 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | ||
17 | @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) | ||
18 | #error Unknown Architecture | ||
19 | #endif | ||
20 | |||
21 | -#elif defined(__GLIBC__) | ||
22 | +#elif defined(__linux__) | ||
23 | |||
24 | #if CPU(X86) | ||
25 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | ||
26 | @@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) | ||
27 | #error Unknown Architecture | ||
28 | #endif | ||
29 | |||
30 | -#elif defined(__GLIBC__) | ||
31 | +#elif defined(__linux__) | ||
32 | |||
33 | // The following sequence depends on glibc's sys/ucontext.h. | ||
34 | #if CPU(X86) | ||
35 | @@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) | ||
36 | #error Unknown Architecture | ||
37 | #endif | ||
38 | |||
39 | -#elif defined(__GLIBC__) | ||
40 | +#elif defined(__linux__) | ||
41 | |||
42 | // The following sequence depends on glibc's sys/ucontext.h. | ||
43 | #if CPU(X86) | ||
44 | @@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) | ||
45 | #error Unknown Architecture | ||
46 | #endif | ||
47 | |||
48 | -#elif defined(__GLIBC__) | ||
49 | +#elif defined(__linux__) | ||
50 | |||
51 | // The following sequence depends on glibc's sys/ucontext.h. | ||
52 | #if CPU(X86) | ||
53 | @@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) | ||
54 | #error Unknown Architecture | ||
55 | #endif | ||
56 | |||
57 | -#elif defined(__GLIBC__) | ||
58 | +#elif defined(__linux__) | ||
59 | |||
60 | // The following sequence depends on glibc's sys/ucontext.h. | ||
61 | #if CPU(X86) | ||
62 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | ||
63 | index 5a2863b..b36c3ff 100644 | ||
64 | --- a/Source/WTF/wtf/Platform.h | ||
65 | +++ b/Source/WTF/wtf/Platform.h | ||
66 | @@ -680,7 +680,7 @@ | ||
67 | #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 | ||
68 | #endif | ||
69 | |||
70 | -#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
71 | +#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) | ||
72 | #define HAVE_MACHINE_CONTEXT 1 | ||
73 | #endif | ||
74 | |||
75 | -- | ||
76 | 2.14.1 | ||
77 | |||
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 index 615fe4f402..896890b433 100644 --- 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 | |||
@@ -1,19 +1,20 @@ | |||
1 | From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 | 1 | From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | 3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 |
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | 4 | Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | Source/WebKit2/PlatformGTK.cmake | 9 +++++---- | 10 | Source/WebKit/PlatformGTK.cmake | 9 +++++---- |
10 | 1 file changed, 5 insertions(+), 4 deletions(-) | 11 | 1 file changed, 5 insertions(+), 4 deletions(-) |
11 | 12 | ||
12 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | 13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
13 | index adaa010..f18cf8a 100644 | 14 | index a33c6a86..d83a2e77 100644 |
14 | --- a/Source/WebKit2/PlatformGTK.cmake | 15 | --- a/Source/WebKit/PlatformGTK.cmake |
15 | +++ b/Source/WebKit2/PlatformGTK.cmake | 16 | +++ b/Source/WebKit/PlatformGTK.cmake |
16 | @@ -906,8 +906,9 @@ endif () | 17 | @@ -1122,8 +1122,9 @@ endif () |
17 | string(REGEX MATCHALL "-L[^ ]*" | 18 | string(REGEX MATCHALL "-L[^ ]*" |
18 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") | 19 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") |
19 | 20 | ||
@@ -25,7 +26,7 @@ index adaa010..f18cf8a 100644 | |||
25 | DEPENDS WebKit2 | 26 | DEPENDS WebKit2 |
26 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
27 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | 28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= |
28 | @@ -950,7 +951,7 @@ add_custom_command( | 29 | @@ -1168,7 +1169,7 @@ add_custom_command( |
29 | add_custom_command( | 30 | add_custom_command( |
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -34,7 +35,7 @@ index adaa010..f18cf8a 100644 | |||
34 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | 35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} |
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
37 | @@ -1004,7 +1005,7 @@ add_custom_command( | 38 | @@ -1225,7 +1226,7 @@ add_custom_command( |
38 | 39 | ||
39 | add_custom_command( | 40 | add_custom_command( |
40 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | 41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib |
@@ -44,5 +45,5 @@ index adaa010..f18cf8a 100644 | |||
44 | ) | 45 | ) |
45 | 46 | ||
46 | -- | 47 | -- |
47 | 2.9.3 | 48 | 2.14.1 |
48 | 49 | ||
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 index 586dd2375c..83fd5129a0 100644 --- 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 | |||
@@ -1,8 +1,8 @@ | |||
1 | From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 | 1 | From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | 3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 |
4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under | 4 | Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works |
5 | OpenEmbedded build system | 5 | under OpenEmbedded build system |
6 | 6 | ||
7 | This requires setting a few environment variables so that the transient | 7 | This requires setting a few environment variables so that the transient |
8 | binary is build and linked correctly, and disabling the tweaks to RUN | 8 | binary is build and linked correctly, and disabling the tweaks to RUN |
@@ -10,26 +10,27 @@ variable from gtkdoc.py script so that our qemu wrapper is taken into use. | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-specific] | 11 | Upstream-Status: Inappropriate [oe-specific] |
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | Source/PlatformGTK.cmake | 2 +- | 15 | Source/PlatformGTK.cmake | 2 +- |
15 | Tools/gtk/gtkdoc.py | 4 ++-- | 16 | Tools/gtk/gtkdoc.py | 4 ++-- |
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | 17 | 2 files changed, 3 insertions(+), 3 deletions(-) |
17 | 18 | ||
18 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake | 19 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake |
19 | index af4d2e3..b7b93c7 100644 | 20 | index 50b5393..7a31db5 100644 |
20 | --- a/Source/PlatformGTK.cmake | 21 | --- a/Source/PlatformGTK.cmake |
21 | +++ b/Source/PlatformGTK.cmake | 22 | +++ b/Source/PlatformGTK.cmake |
22 | @@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | 23 | @@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) |
23 | add_custom_command( | 24 | add_custom_command( |
24 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" | 25 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" |
25 | DEPENDS ${DocumentationDependencies} | 26 | DEPENDS ${DocumentationDependencies} |
26 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} | 27 | - COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} |
27 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/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" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args} |
28 | COMMAND touch ${_stamp_name} | 29 | COMMAND touch ${_stamp_name} |
29 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | 30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" |
30 | ) | 31 | VERBATIM |
31 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py | 32 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py |
32 | index 4c8237b..c0205f0 100644 | 33 | index 03c8e8e..34fbaff 100644 |
33 | --- a/Tools/gtk/gtkdoc.py | 34 | --- a/Tools/gtk/gtkdoc.py |
34 | +++ b/Tools/gtk/gtkdoc.py | 35 | +++ b/Tools/gtk/gtkdoc.py |
35 | @@ -318,9 +318,9 @@ class GTKDoc(object): | 36 | @@ -318,9 +318,9 @@ class GTKDoc(object): |
@@ -38,12 +39,12 @@ index 4c8237b..c0205f0 100644 | |||
38 | current_ld_library_path = env.get('LD_LIBRARY_PATH') | 39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') |
39 | - if current_ld_library_path: | 40 | - if current_ld_library_path: |
40 | + if current_ld_library_path and 'RUN' not in env: | 41 | + if current_ld_library_path and 'RUN' not in env: |
41 | env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) | 42 | env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path) |
42 | - else: | 43 | - else: |
43 | + elif 'RUN' not in env: | 44 | + elif 'RUN' not in env: |
44 | env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path | 45 | env['LD_LIBRARY_PATH'] = self.library_path |
45 | 46 | ||
46 | if ldflags: | 47 | if ldflags: |
47 | -- | 48 | -- |
48 | 2.8.1 | 49 | 2.15.1 |
49 | 50 | ||
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 d6f0ce3cd6..dfdc116018 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,7 +1,7 @@ | |||
1 | From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 | 1 | From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | 3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 |
4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem | 4 | Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem |
5 | 5 | ||
6 | gcc-6 has now introduced stdlib.h in libstdc++ for better | 6 | gcc-6 has now introduced stdlib.h in libstdc++ for better |
7 | compliance and its including the C library stdlib.h using | 7 | compliance and its including the C library stdlib.h using |
@@ -15,68 +15,34 @@ and ends up with compile errors e.g. | |||
15 | /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory | 15 | /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory |
16 | 16 | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | --- | ||
19 | Upstream-Status: Pending | ||
20 | 18 | ||
21 | Source/cmake/WebKitMacros.cmake | 2 +- | 19 | --- |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- |
21 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | ||
22 | Source/WebKit/PlatformGTK.cmake | 2 +- | ||
23 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
24 | Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- | ||
25 | Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- | ||
26 | 6 files changed, 8 insertions(+), 8 deletions(-) | ||
23 | 27 | ||
24 | Index: webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 28 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt |
25 | =================================================================== | 29 | index bc37dd31..4e49871f 100644 |
26 | --- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 30 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt |
27 | +++ webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 31 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt |
28 | @@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL | 32 | @@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
29 | ) | 33 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) |
30 | 34 | WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) | |
31 | include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES}) | 35 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) |
32 | -include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) | 36 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
33 | +include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) | 37 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
34 | 38 | add_executable(jsc ${JSC_SOURCES}) | |
35 | set(WebKitTestNetscapePlugIn_LIBRARIES | 39 | target_link_libraries(jsc ${JSC_LIBRARIES}) |
36 | ${X11_LIBRARIES} | ||
37 | Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt | ||
38 | =================================================================== | ||
39 | --- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt | ||
40 | +++ webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt | ||
41 | @@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES | ||
42 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
43 | |||
44 | include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) | ||
45 | -include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
46 | +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
47 | add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) | ||
48 | target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) | ||
49 | Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
50 | =================================================================== | ||
51 | --- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
52 | +++ webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
53 | @@ -57,7 +57,7 @@ endif () | ||
54 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
55 | |||
56 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
57 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
58 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
59 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
60 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
61 | |||
62 | Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt | ||
63 | =================================================================== | ||
64 | --- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt | ||
65 | +++ webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt | ||
66 | @@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin | ||
67 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
68 | |||
69 | include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) | ||
70 | -include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
71 | +include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
72 | 40 | ||
73 | add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) | 41 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake |
74 | target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) | 42 | index 73506c74..8eb8b415 100644 |
75 | Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake | 43 | --- a/Source/WebCore/PlatformGTK.cmake |
76 | =================================================================== | 44 | +++ b/Source/WebCore/PlatformGTK.cmake |
77 | --- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake | 45 | @@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
78 | +++ webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake | ||
79 | @@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
80 | ${GTK2_INCLUDE_DIRS} | 46 | ${GTK2_INCLUDE_DIRS} |
81 | ${GDK2_INCLUDE_DIRS} | 47 | ${GDK2_INCLUDE_DIRS} |
82 | ) | 48 | ) |
@@ -85,7 +51,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake | |||
85 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 51 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
86 | ) | 52 | ) |
87 | target_link_libraries(WebCorePlatformGTK2 | 53 | target_link_libraries(WebCorePlatformGTK2 |
88 | @@ -346,7 +346,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP | 54 | @@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) |
89 | target_include_directories(WebCorePlatformGTK PRIVATE | 55 | target_include_directories(WebCorePlatformGTK PRIVATE |
90 | ${WebCore_INCLUDE_DIRECTORIES} | 56 | ${WebCore_INCLUDE_DIRECTORIES} |
91 | ) | 57 | ) |
@@ -94,7 +60,7 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake | |||
94 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 60 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
95 | ${GTK_INCLUDE_DIRS} | 61 | ${GTK_INCLUDE_DIRS} |
96 | ${GDK_INCLUDE_DIRS} | 62 | ${GDK_INCLUDE_DIRS} |
97 | @@ -362,7 +362,7 @@ include_directories( | 63 | @@ -321,7 +321,7 @@ include_directories( |
98 | "${WEBCORE_DIR}/bindings/gobject/" | 64 | "${WEBCORE_DIR}/bindings/gobject/" |
99 | ) | 65 | ) |
100 | 66 | ||
@@ -103,37 +69,11 @@ Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake | |||
103 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | 69 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
104 | ) | 70 | ) |
105 | 71 | ||
106 | Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake | 72 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
107 | =================================================================== | 73 | index d83a2e77..401246f4 100644 |
108 | --- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/PlatformGTK.cmake | 74 | --- a/Source/WebKit/PlatformGTK.cmake |
109 | +++ webkitgtk-2.16.5/Tools/TestWebKitAPI/PlatformGTK.cmake | 75 | +++ b/Source/WebKit/PlatformGTK.cmake |
110 | @@ -20,7 +20,7 @@ include_directories( | 76 | @@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
111 | ${WEBKIT2_DIR}/UIProcess/API/gtk | ||
112 | ) | ||
113 | |||
114 | -include_directories(SYSTEM | ||
115 | +include_directories( | ||
116 | ${GDK3_INCLUDE_DIRS} | ||
117 | ${GLIB_INCLUDE_DIRS} | ||
118 | ${GTK3_INCLUDE_DIRS} | ||
119 | Index: webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
120 | =================================================================== | ||
121 | --- webkitgtk-2.16.5.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
122 | +++ webkitgtk-2.16.5/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
123 | @@ -21,7 +21,7 @@ include_directories( | ||
124 | ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk | ||
125 | ) | ||
126 | |||
127 | -include_directories(SYSTEM | ||
128 | +include_directories( | ||
129 | ${ATSPI_INCLUDE_DIRS} | ||
130 | ${GLIB_INCLUDE_DIRS} | ||
131 | ${GSTREAMER_INCLUDE_DIRS} | ||
132 | Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake | ||
133 | =================================================================== | ||
134 | --- webkitgtk-2.16.5.orig/Source/WebKit2/PlatformGTK.cmake | ||
135 | +++ webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake | ||
136 | @@ -1156,7 +1156,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
137 | target_include_directories(WebKitPluginProcess2 PRIVATE | 77 | target_include_directories(WebKitPluginProcess2 PRIVATE |
138 | ${WebKit2CommonIncludeDirectories} | 78 | ${WebKit2CommonIncludeDirectories} |
139 | ) | 79 | ) |
@@ -142,29 +82,45 @@ Index: webkitgtk-2.16.5/Source/WebKit2/PlatformGTK.cmake | |||
142 | ${WebKit2CommonSystemIncludeDirectories} | 82 | ${WebKit2CommonSystemIncludeDirectories} |
143 | ${GTK2_INCLUDE_DIRS} | 83 | ${GTK2_INCLUDE_DIRS} |
144 | ${GDK2_INCLUDE_DIRS} | 84 | ${GDK2_INCLUDE_DIRS} |
145 | Index: webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt | 85 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake |
146 | =================================================================== | 86 | index 7bc89543..d9818fa4 100644 |
147 | --- webkitgtk-2.16.5.orig/Source/JavaScriptCore/shell/CMakeLists.txt | 87 | --- a/Source/cmake/WebKitMacros.cmake |
148 | +++ webkitgtk-2.16.5/Source/JavaScriptCore/shell/CMakeLists.txt | 88 | +++ b/Source/cmake/WebKitMacros.cmake |
149 | @@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | 89 | @@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) |
150 | |||
151 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | ||
152 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | ||
153 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
154 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
155 | add_executable(jsc ${JSC_SOURCES}) | ||
156 | target_link_libraries(jsc ${JSC_LIBRARIES}) | ||
157 | |||
158 | Index: webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake | ||
159 | =================================================================== | ||
160 | --- webkitgtk-2.16.5.orig/Source/cmake/WebKitMacros.cmake | ||
161 | +++ webkitgtk-2.16.5/Source/cmake/WebKitMacros.cmake | ||
162 | @@ -277,7 +277,7 @@ macro(WEBKIT_WRAP_SOURCELIST) | ||
163 | endmacro() | 90 | endmacro() |
164 | 91 | ||
165 | macro(WEBKIT_FRAMEWORK _target) | 92 | macro(WEBKIT_FRAMEWORK _target) |
166 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | 93 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) |
167 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | 94 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) |
168 | add_library(${_target} ${${_target}_LIBRARY_TYPE} | 95 | target_sources(${_target} PRIVATE |
169 | ${${_target}_HEADERS} | 96 | ${${_target}_HEADERS} |
170 | ${${_target}_SOURCES} | 97 | ${${_target}_SOURCES} |
98 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
99 | index e832a86d..ce92c864 100644 | ||
100 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
101 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
102 | @@ -57,7 +57,7 @@ endif () | ||
103 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
104 | |||
105 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
106 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
107 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
108 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
109 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
110 | |||
111 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
112 | index 1be3dd52..7bdddf37 100644 | ||
113 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
114 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
115 | @@ -20,7 +20,7 @@ include_directories( | ||
116 | ${WEBKIT2_DIR}/UIProcess/API/gtk | ||
117 | ) | ||
118 | |||
119 | -include_directories(SYSTEM | ||
120 | +include_directories( | ||
121 | ${GDK3_INCLUDE_DIRS} | ||
122 | ${GLIB_INCLUDE_DIRS} | ||
123 | ${GTK3_INCLUDE_DIRS} | ||
124 | -- | ||
125 | 2.14.1 | ||
126 | |||
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 index 3f71297f50..fb4c4dc932 100644 --- 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 | |||
@@ -1,23 +1,24 @@ | |||
1 | From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001 | 1 | From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 | 3 | Date: Wed, 28 Oct 2015 14:18:57 +0200 |
4 | Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the | 4 | Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to |
5 | compiler flags. | 5 | the compiler flags. |
6 | 6 | ||
7 | g-ir-compiler is using a C compiler internally, so it needs to set | 7 | g-ir-compiler is using a C compiler internally, so it needs to set |
8 | the proper flags for it. | 8 | the proper flags for it. |
9 | 9 | ||
10 | Upstream-Status: Pending [review on oe-core list] | 10 | Upstream-Status: Pending [review on oe-core list] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | Source/WebKit2/PlatformGTK.cmake | 4 ++-- | 14 | Source/WebKit/PlatformGTK.cmake | 4 ++-- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 16 | ||
16 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
17 | =================================================================== | 18 | index 7f92ae72..a33c6a86 100644 |
18 | --- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake | 19 | --- a/Source/WebKit/PlatformGTK.cmake |
19 | +++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 20 | +++ b/Source/WebKit/PlatformGTK.cmake |
20 | @@ -910,7 +910,7 @@ add_custom_command( | 21 | @@ -1126,7 +1126,7 @@ add_custom_command( |
21 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 22 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
22 | DEPENDS WebKit2 | 23 | DEPENDS WebKit2 |
23 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 24 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -26,7 +27,7 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | |||
26 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 27 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
27 | ${INTROSPECTION_SCANNER} | 28 | ${INTROSPECTION_SCANNER} |
28 | --quiet | 29 | --quiet |
29 | @@ -951,7 +951,7 @@ add_custom_command( | 30 | @@ -1169,7 +1169,7 @@ add_custom_command( |
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 33 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
@@ -35,3 +36,6 @@ Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | |||
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | 36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" |
36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
37 | ${INTROSPECTION_SCANNER} | 38 | ${INTROSPECTION_SCANNER} |
39 | -- | ||
40 | 2.14.1 | ||
41 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch index 12836f28f2..c6157e1037 100644 --- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | |||
@@ -1,22 +1,31 @@ | |||
1 | From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 May 2017 22:34:24 -0700 | ||
4 | Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 | ||
5 | |||
1 | Taken from | 6 | Taken from |
2 | https://bugs.webkit.org/show_bug.cgi?id=161900 | 7 | https://bugs.webkit.org/show_bug.cgi?id=161900 |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
6 | 11 | ||
7 | Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | 12 | --- |
8 | =================================================================== | 13 | Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- |
9 | --- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt | 14 | 1 file changed, 9 insertions(+), 1 deletion(-) |
10 | +++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | 15 | |
11 | @@ -182,7 +182,6 @@ set(WTF_HEADERS | 16 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt |
17 | index 6b5e45b9..46ee3c22 100644 | ||
18 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
19 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
20 | @@ -205,7 +205,6 @@ set(WTF_HEADERS | ||
12 | 21 | ||
13 | set(WTF_SOURCES | 22 | set(WTF_SOURCES |
14 | Assertions.cpp | 23 | Assertions.cpp |
15 | - Atomics.cpp | 24 | - Atomics.cpp |
16 | AutomaticThread.cpp | 25 | AutomaticThread.cpp |
17 | BitVector.cpp | 26 | BitVector.cpp |
18 | ClockType.cpp | 27 | CPUTime.cpp |
19 | @@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) | 28 | @@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) |
20 | list(APPEND WTF_LIBRARIES bmalloc) | 29 | list(APPEND WTF_LIBRARIES bmalloc) |
21 | endif () | 30 | endif () |
22 | 31 | ||
@@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | |||
32 | list(APPEND WTF_SOURCES | 41 | list(APPEND WTF_SOURCES |
33 | unicode/icu/CollatorICU.cpp | 42 | unicode/icu/CollatorICU.cpp |
34 | ) | 43 | ) |
44 | -- | ||
45 | 2.14.1 | ||
46 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch deleted file mode 100644 index aee29a9a72..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Imported from | ||
2 | https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch | ||
3 | |||
4 | Add to CXX flags since webkitgtk uses c++ compiler by default | ||
5 | Fixes | ||
6 | Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const' | ||
7 | | return bitwise_cast<const typename Adaptor::Type*>(vector()); | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake | ||
13 | --- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100 | ||
14 | +++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100 | ||
15 | @@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG) | ||
16 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") | ||
17 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") | ||
18 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") | ||
19 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") | ||
20 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") | ||
21 | endif () | ||
22 | |||
23 | if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch deleted file mode 100644 index 4fdd56fea0..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Replace __GLIBC__ with __linux__ since musl also supports it | ||
2 | so checking __linux__ is more accomodating | ||
3 | |||
4 | See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
10 | =================================================================== | ||
11 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
12 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
13 | @@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: | ||
14 | #error Unknown Architecture | ||
15 | #endif | ||
16 | |||
17 | -#elif defined(__GLIBC__) && ENABLE(JIT) | ||
18 | +#elif defined(__linux__) && ENABLE(JIT) | ||
19 | |||
20 | #if CPU(X86) | ||
21 | return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); | ||
22 | @@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: | ||
23 | #error Unknown Architecture | ||
24 | #endif | ||
25 | |||
26 | -#elif defined(__GLIBC__) | ||
27 | +#elif defined(__linux__) // glibc and musl | ||
28 | |||
29 | // The following sequence depends on glibc's sys/ucontext.h. | ||
30 | #if CPU(X86) | ||
31 | @@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: | ||
32 | #error Unknown Architecture | ||
33 | #endif | ||
34 | |||
35 | -#elif defined(__GLIBC__) | ||
36 | +#elif defined(__linux__) // glibc and musl | ||
37 | |||
38 | // The following sequence depends on glibc's sys/ucontext.h. | ||
39 | #if CPU(X86) | ||
40 | @@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: | ||
41 | #error Unknown Architecture | ||
42 | #endif | ||
43 | |||
44 | -#elif defined(__GLIBC__) | ||
45 | +#elif defined(__linux__) // glibc and musl | ||
46 | |||
47 | // The following sequence depends on glibc's sys/ucontext.h. | ||
48 | #if CPU(X86) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch deleted file mode 100644 index a1ad248aac..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | ucontext structure is different between musl and glibc for ppc | ||
2 | therefore its not enough just to check for arch alone, we also | ||
3 | need to check for libc type. | ||
4 | |||
5 | Fixes errors like | ||
6 | |||
7 | Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? | ||
8 | thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | Index: webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
15 | =================================================================== | ||
16 | --- webkitgtk-2.16.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
17 | +++ webkitgtk-2.16.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
18 | @@ -88,7 +88,7 @@ static void pthreadSignalHandlerSuspendR | ||
19 | } | ||
20 | |||
21 | ucontext_t* userContext = static_cast<ucontext_t*>(ucontext); | ||
22 | -#if CPU(PPC) | ||
23 | +#if CPU(PPC) && defined(__GLIBC__) | ||
24 | threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; | ||
25 | #else | ||
26 | threadData->suspendedMachineContext = userContext->uc_mcontext; | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb index 0f126cba81..a64aee22e6 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.5.bb | |||
@@ -13,19 +13,17 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
14 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ | 14 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ |
15 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ | 15 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ |
16 | file://musl-fixes.patch \ | ||
17 | file://ppc-musl-fix.patch \ | ||
18 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | 16 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ |
19 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | 17 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ |
20 | file://x32_support.patch \ | 18 | file://x32_support.patch \ |
21 | file://cross-compile.patch \ | 19 | file://cross-compile.patch \ |
22 | file://gcc7.patch \ | ||
23 | file://detect-atomics-during-configure.patch \ | 20 | file://detect-atomics-during-configure.patch \ |
24 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ | 21 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ |
22 | file://0001-Fix-build-with-musl.patch \ | ||
25 | " | 23 | " |
26 | 24 | ||
27 | SRC_URI[md5sum] = "0e2d142a586e4ff79cf0324f4fdbf20c" | 25 | SRC_URI[md5sum] = "af18c2cfa00cadfd0b4d8db21cab011d" |
28 | SRC_URI[sha256sum] = "fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21" | 26 | SRC_URI[sha256sum] = "0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8" |
29 | 27 | ||
30 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 28 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
31 | 29 | ||
@@ -37,7 +35,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ | |||
37 | pango icu bison-native gawk intltool-native libwebp \ | 35 | pango icu bison-native gawk intltool-native libwebp \ |
38 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ | 36 | atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ |
39 | ruby-native libnotify gstreamer1.0-plugins-bad \ | 37 | ruby-native libnotify gstreamer1.0-plugins-bad \ |
40 | gettext-native glib-2.0 glib-2.0-native \ | 38 | gettext-native glib-2.0 glib-2.0-native libtasn1 \ |
41 | " | 39 | " |
42 | 40 | ||
43 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ | 41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ |
@@ -66,6 +64,10 @@ EXTRA_OECMAKE = " \ | |||
66 | -DPYTHON_EXECUTABLE=`which python` \ | 64 | -DPYTHON_EXECUTABLE=`which python` \ |
67 | " | 65 | " |
68 | 66 | ||
67 | # GL/GLES header clash: both define the same thing, differently, on 32 bit x86 | ||
68 | EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " | ||
69 | EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " | ||
70 | |||
69 | # Javascript JIT is not supported on powerpc | 71 | # Javascript JIT is not supported on powerpc |
70 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " | 72 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " |
71 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " | 73 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " |
@@ -91,7 +93,7 @@ EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " | |||
91 | # An attempt was made to upstream JIT support for x32 in | 93 | # An attempt was made to upstream JIT support for x32 in |
92 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as | 94 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as |
93 | # unresolved due to limited X32 adoption. | 95 | # unresolved due to limited X32 adoption. |
94 | EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF" | 96 | EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " |
95 | 97 | ||
96 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | 98 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" |
97 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | 99 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" |