summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-04 14:13:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:02 +0100
commit70b86ae68ff94c9534fdfaf2b02d1c8fe1c4cb5a (patch)
treee52f7679ea8e60053f954ff7dec98c0a09a7a194
parent8cbbadd4444e02614085156bdb334ec2666efde9 (diff)
downloadpoky-70b86ae68ff94c9534fdfaf2b02d1c8fe1c4cb5a.tar.gz
webkitgtk: update to 2.20.0
Rebase patches, remove a couple of upstreamed patches. Add an option to enable woff2 font library (not currently packaged by oe). (From OE-Core rev: 182f096210d74d44dd452f2b3f09ec0c3c75f074) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch28
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch38
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch63
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch15
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch52
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch47
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch17
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch29
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/x32_support.patch24
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.20.0.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.18.6.bb)8
10 files changed, 124 insertions, 197 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
index 7cc4514fcc..041ec4675f 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -1,24 +1,25 @@
1From 415e31bd5444fa360af58b069f1b9db6607fca7d Mon Sep 17 00:00:00 2001 1From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300 3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl 4Subject: [PATCH] Fix build with musl
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- 10 Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++-
10 Source/WTF/wtf/Platform.h | 2 +- 11 Source/WTF/wtf/Platform.h | 2 +-
11 2 files changed, 6 insertions(+), 6 deletions(-) 12 2 files changed, 18 insertions(+), 2 deletions(-)
12 13
13diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h 14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
14index 95080b9..2bb689c 100644 15index bf0bdc7..84b8a8a 100644
15--- a/Source/JavaScriptCore/runtime/MachineContext.h 16--- a/Source/JavaScriptCore/runtime/MachineContext.h
16+++ b/Source/JavaScriptCore/runtime/MachineContext.h 17+++ b/Source/JavaScriptCore/runtime/MachineContext.h
17@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) 18@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
18 #error Unknown Architecture 19 #error Unknown Architecture
19 #endif 20 #endif
20 21
21-#elif defined(__GLIBC__) 22-#elif defined(__GLIBC__) || defined(__BIONIC__)
22+#elif defined(__linux__) 23+#elif defined(__linux__)
23 24
24 #if CPU(X86) 25 #if CPU(X86)
@@ -27,7 +28,7 @@ index 95080b9..2bb689c 100644
27 #error Unknown Architecture 28 #error Unknown Architecture
28 #endif 29 #endif
29 30
30-#elif defined(__GLIBC__) 31-#elif defined(__GLIBC__) || defined(__BIONIC__)
31+#elif defined(__linux__) 32+#elif defined(__linux__)
32 33
33 // The following sequence depends on glibc's sys/ucontext.h. 34 // The following sequence depends on glibc's sys/ucontext.h.
@@ -36,7 +37,7 @@ index 95080b9..2bb689c 100644
36 #error Unknown Architecture 37 #error Unknown Architecture
37 #endif 38 #endif
38 39
39-#elif defined(__GLIBC__) 40-#elif defined(__GLIBC__) || defined(__BIONIC__)
40+#elif defined(__linux__) 41+#elif defined(__linux__)
41 42
42 // The following sequence depends on glibc's sys/ucontext.h. 43 // The following sequence depends on glibc's sys/ucontext.h.
@@ -45,7 +46,7 @@ index 95080b9..2bb689c 100644
45 #error Unknown Architecture 46 #error Unknown Architecture
46 #endif 47 #endif
47 48
48-#elif defined(__GLIBC__) 49-#elif defined(__GLIBC__) || defined(__BIONIC__)
49+#elif defined(__linux__) 50+#elif defined(__linux__)
50 51
51 // The following sequence depends on glibc's sys/ucontext.h. 52 // The following sequence depends on glibc's sys/ucontext.h.
@@ -54,24 +55,21 @@ index 95080b9..2bb689c 100644
54 #error Unknown Architecture 55 #error Unknown Architecture
55 #endif 56 #endif
56 57
57-#elif defined(__GLIBC__) 58-#elif defined(__GLIBC__) || defined(__BIONIC__)
58+#elif defined(__linux__) 59+#elif defined(__linux__)
59 60
60 // The following sequence depends on glibc's sys/ucontext.h. 61 // The following sequence depends on glibc's sys/ucontext.h.
61 #if CPU(X86) 62 #if CPU(X86)
62diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h 63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
63index 5a2863b..b36c3ff 100644 64index 551c047..e50b05a 100644
64--- a/Source/WTF/wtf/Platform.h 65--- a/Source/WTF/wtf/Platform.h
65+++ b/Source/WTF/wtf/Platform.h 66+++ b/Source/WTF/wtf/Platform.h
66@@ -680,7 +680,7 @@ 67@@ -683,7 +683,7 @@
67 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 68 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
68 #endif 69 #endif
69 70
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(__GLIBC__) || defined(__BIONIC__)) && (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+#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 #define HAVE_MACHINE_CONTEXT 1
73 #endif 74 #endif
74 75
75--
762.14.1
77
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
deleted file mode 100644
index 21574072f1..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001
2From: Bhargava Sreekantappa Gayathri
3 <bhargava.sreekantappa-gayathri@xilinx.com>
4Date: Tue, 27 Feb 2018 16:09:31 -0800
5Subject: [PATCH] Fix gles3 header when gles2 is enabled
6
7A GLES 2 application should not use gl3.h.
8Fix the gles3 header failure while compiling webkitgtk.
9
10FAILED:
11Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o
12 ^~~~~~~~~~~~~
13compilation terminated.
14
15Upstream-Status: Backport
16Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008
17
18Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
19Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
20---
21 Source/WebCore/platform/graphics/GLContext.cpp | 1 -
22 1 file changed, 1 deletion(-)
23
24diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
25index 599dcc0..46d2fd4 100644
26--- a/Source/WebCore/platform/graphics/GLContext.cpp
27+++ b/Source/WebCore/platform/graphics/GLContext.cpp
28@@ -31,7 +31,6 @@
29 #elif USE(OPENGL_ES_2)
30 #define GL_GLEXT_PROTOTYPES 1
31 #include <GLES2/gl2.h>
32-#include <GLES3/gl3.h>
33 #endif
34
35 #if USE(GLX)
36--
372.7.4
38
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 896890b433..aa9a06701a 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,7 +1,7 @@
1From b7f40eceef0f23bf88090789d4c5845c35f048ae Mon Sep 17 00:00:00 2001 1From 0afc194c6446e6c3242f1d706b4564e3a9cb2cee Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Aug 2016 16:38:11 +0300 3Date: Mon, 29 Aug 2016 16:38:11 +0300
4Subject: [PATCH 4/9] Fix racy parallel build of WebKit2-4.0.gir 4Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -11,39 +11,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 1 file changed, 5 insertions(+), 4 deletions(-) 11 1 file changed, 5 insertions(+), 4 deletions(-)
12 12
13diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 13diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
14index a33c6a86..d83a2e77 100644 14index a074a80..8c6ebb5 100644
15--- a/Source/WebKit/PlatformGTK.cmake 15--- a/Source/WebKit/PlatformGTK.cmake
16+++ b/Source/WebKit/PlatformGTK.cmake 16+++ b/Source/WebKit/PlatformGTK.cmake
17@@ -1122,8 +1122,9 @@ endif () 17@@ -728,8 +728,9 @@ if (ENABLE_INTROSPECTION)
18 string(REGEX MATCHALL "-L[^ ]*" 18 string(REGEX MATCHALL "-L[^ ]*"
19 INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") 19 INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
20 20
21-add_custom_command( 21- add_custom_command(
22- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 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 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 24+ # and a .typelib, which would trigger two racy parallel builds when using command
25+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir 25+ add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
26 DEPENDS WebKit2 26 DEPENDS WebKit
27 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 27 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
28 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=
29@@ -1168,7 +1169,7 @@ add_custom_command( 29@@ -773,7 +774,7 @@ if (ENABLE_INTROSPECTION)
30 add_custom_command( 30 add_custom_command(
31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
33- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 33- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
34+ DEPENDS 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} 35 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
38@@ -1225,7 +1226,7 @@ add_custom_command( 38@@ -828,7 +829,7 @@ if (ENABLE_INTROSPECTION)
39 39
40 add_custom_command( 40 add_custom_command(
41 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib 41 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
42- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 42- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
43+ DEPENDS 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 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 ) 45 )
46 46
47--
482.14.1
49
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
index 0f6eeed1a2..e8d1d8c341 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
@@ -1,4 +1,4 @@
1From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001 1From bed4cf4aaa6aad4172ec9942e9039fb8e1ef68a4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Feb 2016 18:13:39 +0200 3Date: Mon, 29 Feb 2016 18:13:39 +0200
4Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc 4Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc
@@ -11,16 +11,17 @@ through the use of qemu target emulation.
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 12
13Upstream-Status: Pending 13Upstream-Status: Pending
14
14--- 15---
15 Source/cmake/OptionsGTK.cmake | 6 ------ 16 Source/cmake/OptionsGTK.cmake | 6 ------
16 1 file changed, 6 deletions(-) 17 1 file changed, 6 deletions(-)
17 18
18Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake 19diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
19=================================================================== 20index 661b40e..404441b 100644
20--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake 21--- a/Source/cmake/OptionsGTK.cmake
21+++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake 22+++ b/Source/cmake/OptionsGTK.cmake
22@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN) 23@@ -352,12 +352,6 @@ if (ENABLED_COMPILER_SANITIZERS)
23 endif () 24 set(ENABLE_INTROSPECTION OFF)
24 endif () 25 endif ()
25 26
26-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building. 27-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
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 9fc1421fdd..034219f826 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 @@
1From ef832a115b40861c08df333339b1366da49e5393 Mon Sep 17 00:00:00 2001 1From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700 3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH 9/9] WebKitMacros: Append to -I and not to -isystem 4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
5 5
6gcc-6 has now introduced stdlib.h in libstdc++ for better 6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using 7compliance and its including the C library stdlib.h using
@@ -17,6 +17,7 @@ and ends up with compile errors e.g.
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 18
19Upstream-Status: Pending 19Upstream-Status: Pending
20
20--- 21---
21 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- 22 Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
22 Source/WebCore/PlatformGTK.cmake | 6 +++--- 23 Source/WebCore/PlatformGTK.cmake | 6 +++---
@@ -27,23 +28,23 @@ Upstream-Status: Pending
27 6 files changed, 8 insertions(+), 8 deletions(-) 28 6 files changed, 8 insertions(+), 8 deletions(-)
28 29
29diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt 30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
30index bc37dd31..4e49871f 100644 31index b3c7e0b..88446de 100644
31--- a/Source/JavaScriptCore/shell/CMakeLists.txt 32--- a/Source/JavaScriptCore/shell/CMakeLists.txt
32+++ b/Source/JavaScriptCore/shell/CMakeLists.txt 33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
33@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 34@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
34 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) 35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
35 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) 36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
36 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) 37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
37-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) 38-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
38+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) 39+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
39 add_executable(jsc ${JSC_SOURCES}) 40 add_executable(jsc ${JSC_SOURCES})
40 target_link_libraries(jsc ${JSC_LIBRARIES}) 41 target_link_libraries(jsc ${JSC_LIBRARIES})
41 42
42diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake 43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
43index 73506c74..8eb8b415 100644 44index 32c6ccc..fef5e8b 100644
44--- a/Source/WebCore/PlatformGTK.cmake 45--- a/Source/WebCore/PlatformGTK.cmake
45+++ b/Source/WebCore/PlatformGTK.cmake 46+++ b/Source/WebCore/PlatformGTK.cmake
46@@ -281,7 +281,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 47@@ -159,7 +159,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
47 ${GTK2_INCLUDE_DIRS} 48 ${GTK2_INCLUDE_DIRS}
48 ${GDK2_INCLUDE_DIRS} 49 ${GDK2_INCLUDE_DIRS}
49 ) 50 )
@@ -52,7 +53,7 @@ index 73506c74..8eb8b415 100644
52 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
53 ) 54 )
54 target_link_libraries(WebCorePlatformGTK2 55 target_link_libraries(WebCorePlatformGTK2
55@@ -305,7 +305,7 @@ add_dependencies(WebCorePlatformGTK WebCore) 56@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
56 target_include_directories(WebCorePlatformGTK PRIVATE 57 target_include_directories(WebCorePlatformGTK PRIVATE
57 ${WebCore_INCLUDE_DIRECTORIES} 58 ${WebCore_INCLUDE_DIRECTORIES}
58 ) 59 )
@@ -61,7 +62,7 @@ index 73506c74..8eb8b415 100644
61 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
62 ${GTK_INCLUDE_DIRS} 63 ${GTK_INCLUDE_DIRS}
63 ${GDK_INCLUDE_DIRS} 64 ${GDK_INCLUDE_DIRS}
64@@ -321,7 +321,7 @@ include_directories( 65@@ -199,7 +199,7 @@ include_directories(
65 "${WEBCORE_DIR}/bindings/gobject/" 66 "${WEBCORE_DIR}/bindings/gobject/"
66 ) 67 )
67 68
@@ -71,33 +72,33 @@ index 73506c74..8eb8b415 100644
71 ) 72 )
72 73
73diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
74index d83a2e77..401246f4 100644 75index 8c6ebb5..772c243 100644
75--- a/Source/WebKit/PlatformGTK.cmake 76--- a/Source/WebKit/PlatformGTK.cmake
76+++ b/Source/WebKit/PlatformGTK.cmake 77+++ b/Source/WebKit/PlatformGTK.cmake
77@@ -1050,7 +1050,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 78@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
78 target_include_directories(WebKitPluginProcess2 PRIVATE 79 target_include_directories(WebKitPluginProcess2 PRIVATE
79 ${WebKit2CommonIncludeDirectories} 80 ${WebKitCommonIncludeDirectories}
80 ) 81 )
81- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE 82- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
82+ target_include_directories(WebKitPluginProcess2 PRIVATE 83+ target_include_directories(WebKitPluginProcess2 PRIVATE
83 ${WebKit2CommonSystemIncludeDirectories} 84 ${WebKitCommonSystemIncludeDirectories}
84 ${GTK2_INCLUDE_DIRS} 85 ${GTK2_INCLUDE_DIRS}
85 ${GDK2_INCLUDE_DIRS} 86 ${GDK2_INCLUDE_DIRS}
86diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake 87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
87index 7bc89543..d9818fa4 100644 88index a1e7e8f..ce24274 100644
88--- a/Source/cmake/WebKitMacros.cmake 89--- a/Source/cmake/WebKitMacros.cmake
89+++ b/Source/cmake/WebKitMacros.cmake 90+++ b/Source/cmake/WebKitMacros.cmake
90@@ -78,7 +78,7 @@ macro(WEBKIT_FRAMEWORK_DECLARE _target) 91@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target)
91 endmacro()
92
93 macro(WEBKIT_FRAMEWORK _target)
94- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
95+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
96 target_sources(${_target} PRIVATE
97 ${${_target}_HEADERS}
98 ${${_target}_SOURCES} 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}")
99diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt 100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
100index e832a86d..ce92c864 100644 101index dc2b61e..0128dca 100644
101--- a/Tools/MiniBrowser/gtk/CMakeLists.txt 102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
102+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt 103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
103@@ -57,7 +57,7 @@ endif () 104@@ -57,7 +57,7 @@ endif ()
@@ -110,11 +111,11 @@ index e832a86d..ce92c864 100644
110 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
111 112
112diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake 113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
113index 1be3dd52..7bdddf37 100644 114index 4aef695..a14b163 100644
114--- a/Tools/TestWebKitAPI/PlatformGTK.cmake 115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
115+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake 116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
116@@ -20,7 +20,7 @@ include_directories( 117@@ -20,7 +20,7 @@ include_directories(
117 ${WEBKIT2_DIR}/UIProcess/API/gtk 118 ${WEBKIT_DIR}/UIProcess/API/gtk
118 ) 119 )
119 120
120-include_directories(SYSTEM 121-include_directories(SYSTEM
@@ -122,6 +123,3 @@ index 1be3dd52..7bdddf37 100644
122 ${GDK3_INCLUDE_DIRS} 123 ${GDK3_INCLUDE_DIRS}
123 ${GLIB_INCLUDE_DIRS} 124 ${GLIB_INCLUDE_DIRS}
124 ${GTK3_INCLUDE_DIRS} 125 ${GTK3_INCLUDE_DIRS}
125--
1262.14.1
127
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 fb4c4dc932..923d00c4ba 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,8 +1,8 @@
1From 98b1359a0cd87bbdb22cef98ba594440f4c57d92 Mon Sep 17 00:00:00 2001 1From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Oct 2015 14:18:57 +0200 3Date: Wed, 28 Oct 2015 14:18:57 +0200
4Subject: [PATCH 2/9] When building introspection files, add CMAKE_C_FLAGS to 4Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
5 the compiler flags. 5 compiler flags.
6 6
7g-ir-compiler is using a C compiler internally, so it needs to set 7g-ir-compiler is using a C compiler internally, so it needs to set
8the proper flags for it. 8the proper flags for it.
@@ -15,27 +15,24 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 17diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
18index 7f92ae72..a33c6a86 100644 18index dc6b306..a074a80 100644
19--- a/Source/WebKit/PlatformGTK.cmake 19--- a/Source/WebKit/PlatformGTK.cmake
20+++ b/Source/WebKit/PlatformGTK.cmake 20+++ b/Source/WebKit/PlatformGTK.cmake
21@@ -1126,7 +1126,7 @@ add_custom_command( 21@@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION)
22 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 22 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
23 DEPENDS WebKit2 23 DEPENDS WebKit
24 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 24 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
25- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= 25- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
26+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= 26+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
27 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 27 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
28 ${INTROSPECTION_SCANNER} 28 ${INTROSPECTION_SCANNER}
29 --quiet 29 --quiet
30@@ -1169,7 +1169,7 @@ add_custom_command( 30@@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION)
31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 31 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 32 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
33 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 33 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
34- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations 34- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
35+ 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}
36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 36 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 37 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
38 ${INTROSPECTION_SCANNER} 38 ${INTROSPECTION_SCANNER}
39--
402.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 c6157e1037..bbdb64490a 100644
--- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
@@ -1,7 +1,7 @@
1From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 1From d907ac649ff5514826af9ad7e97e15dfcf79909c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 17 May 2017 22:34:24 -0700 3Date: Wed, 17 May 2017 22:34:24 -0700
4Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 4Subject: [PATCH] webkitgtk: Fix build for armv5
5 5
6Taken from 6Taken from
7https://bugs.webkit.org/show_bug.cgi?id=161900 7https://bugs.webkit.org/show_bug.cgi?id=161900
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 9 insertions(+), 1 deletion(-) 14 1 file changed, 9 insertions(+), 1 deletion(-)
15 15
16diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt 16diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
17index 6b5e45b9..46ee3c22 100644 17index 220bafd..4e1e9f8 100644
18--- a/Source/WTF/wtf/CMakeLists.txt 18--- a/Source/WTF/wtf/CMakeLists.txt
19+++ b/Source/WTF/wtf/CMakeLists.txt 19+++ b/Source/WTF/wtf/CMakeLists.txt
20@@ -205,7 +205,6 @@ set(WTF_HEADERS 20@@ -315,7 +315,6 @@ set(WTF_HEADERS
21 21
22 set(WTF_SOURCES 22 set(WTF_SOURCES
23 Assertions.cpp 23 Assertions.cpp
@@ -25,7 +25,7 @@ index 6b5e45b9..46ee3c22 100644
25 AutomaticThread.cpp 25 AutomaticThread.cpp
26 BitVector.cpp 26 BitVector.cpp
27 CPUTime.cpp 27 CPUTime.cpp
28@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) 28@@ -458,6 +457,15 @@ if (NOT USE_SYSTEM_MALLOC)
29 list(APPEND WTF_LIBRARIES bmalloc) 29 list(APPEND WTF_LIBRARIES bmalloc)
30 endif () 30 endif ()
31 31
@@ -39,8 +39,5 @@ index 6b5e45b9..46ee3c22 100644
39+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) 39+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
40+ 40+
41 list(APPEND WTF_SOURCES 41 list(APPEND WTF_SOURCES
42 unicode/icu/CollatorICU.cpp 42 unicode/CollatorDefault.cpp
43 ) 43
44--
452.14.1
46
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
deleted file mode 100644
index 4a6ab544b2..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Fix configure failure for aarch64
2
3| -- Performing Test CXX_COMPILER_SUPPORTS_-fcolor-diagnostics - Failed
4| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always
5| -- Performing Test CXX_COMPILER_SUPPORTS_-fdiagnostics-color=always - Success
6| CMake Error at Source/cmake/OptionsCommon.cmake:42 (WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG):
7| Unknown CMake command "WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG".
8| Call Stack (most recent call first):
9| Source/cmake/WebKitCommon.cmake:58 (include)
10| CMakeLists.txt:166 (include)
11|
12
13Upstream-Status: Pending
14
15Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
16
17Index: webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake
18===================================================================
19--- webkitgtk-2.14.6.orig/Source/cmake/OptionsCommon.cmake 2018-02-15 18:56:29.315238564 -0800
20+++ webkitgtk-2.14.6/Source/cmake/OptionsCommon.cmake 2018-02-15 18:54:57.469518064 -0800
21@@ -39,7 +39,7 @@
22 if (NOT WTF_CPU_ARM64)
23 message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64")
24 endif ()
25- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAG(-mfix-cortex-a53-835769)
26+ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769)
27 endif ()
28
29 EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
index 5f23837585..f2454b9849 100644
--- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
@@ -1,13 +1,19 @@
1From 897563a0397266d8ceb058f172e16b06419b2593 Mon Sep 17 00:00:00 2001
1From: Daniel Schepler <dschepler@gmail.com> 2From: Daniel Schepler <dschepler@gmail.com>
2Subject: Fix FTBFS in x32 3Date: Mon, 26 Mar 2018 17:48:34 +0300
3Bug-Debian: https://bugs.debian.org/700795 4Subject: [PATCH] Fix FTBFS in x32
4Upstream-Status: Pending 5
5Signed-off-by: Christopher Larson <chris_larson@mentor.com>
6Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
7=================================================================== 6===================================================================
8--- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h 7
9+++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h 8---
10@@ -172,7 +172,11 @@ 9 Source/WTF/wtf/Platform.h | 4 ++++
10 1 file changed, 4 insertions(+)
11
12diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
13index 850e298..551c047 100644
14--- a/Source/WTF/wtf/Platform.h
15+++ b/Source/WTF/wtf/Platform.h
16@@ -132,7 +132,11 @@
11 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ 17 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
12 #if defined(__x86_64__) \ 18 #if defined(__x86_64__) \
13 || defined(_M_X64) 19 || defined(_M_X64)
@@ -17,5 +23,5 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
17 #define WTF_CPU_X86_64 1 23 #define WTF_CPU_X86_64 1
18+#endif 24+#endif
19 #define WTF_CPU_X86_SSE2 1 25 #define WTF_CPU_X86_SSE2 1
26 #define WTF_CPU_KNOWN 1
20 #endif 27 #endif
21
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
index c29fa7f4c5..50e2666578 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
@@ -20,12 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://detect-atomics-during-configure.patch \ 20 file://detect-atomics-during-configure.patch \
21 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 \ 22 file://0001-Fix-build-with-musl.patch \
23 file://fix-configure-failure-aarch64.patch \
24 file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \
25 " 23 "
26 24
27SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" 25SRC_URI[md5sum] = "51cc47345c3ec53802718cd6fc9b746f"
28SRC_URI[sha256sum] = "93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c" 26SRC_URI[sha256sum] = "57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c"
29 27
30inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 28inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
31 29
@@ -56,6 +54,8 @@ PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
56PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl" 54PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
57PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" 55PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
58PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" 56PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
57# Source is at https://github.com/google/woff2
58PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
59 59
60EXTRA_OECMAKE = " \ 60EXTRA_OECMAKE = " \
61 -DPORT=GTK \ 61 -DPORT=GTK \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 22:42:02 +0000