diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-21 18:02:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-22 12:02:57 +0000 |
commit | 3da759cd973dcd0facfd884eec3ef0edf70bfcc8 (patch) | |
tree | 08df42e9af892e99cb2b06b6fb2ea0598698e990 /meta | |
parent | 00822848f594c57bb55e471983ff64f75a26a3a3 (diff) | |
download | poky-3da759cd973dcd0facfd884eec3ef0edf70bfcc8.tar.gz |
webkitgtk: update to 2.22.3
Remove upstreamed patches.
Add a tweak to 0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
for Javascriptcore gir file (previously it was pre-compiled in tarballs).
Rebase 0001-Fix-build-with-musl.patch
(From OE-Core rev: 7cd49245249f5c20579d1bb3992d60f3ed40708c)
Signed-off-by: Alexander Kanavin <alex.kanavin@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-PaintingData-has-no-member-named-lightVector-on-.patch | 37 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch | 36 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch | 44 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch | 31 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.22.3.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.20.5.bb) | 7 |
6 files changed, 40 insertions, 141 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch deleted file mode 100644 index 25f4846592..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From a5d4e038268ae23486fecc1966fd2e16a7f40ce8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 25 Jul 2018 00:23:48 -0700 | ||
4 | Subject: [PATCH] Fix PaintingData' has no member named 'lightVector' on | ||
5 | ARM_NEON | ||
6 | |||
7 | * platform/graphics/cpu/arm/filters/FELightingNEON.h: | ||
8 | (WebCore::FELighting::platformApplyNeon): | ||
9 | |||
10 | Upstream-Status: Submitted | ||
11 | https://bugs.webkit.org/show_bug.cgi?id=187991 | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
19 | index 42af922..b542a4c 100644 | ||
20 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
21 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
22 | @@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS | ||
23 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; | ||
24 | } else { | ||
25 | ASSERT(m_lightSource->type() == LS_DISTANT); | ||
26 | - floatArguments.lightX = paintingData.lightVector.x(); | ||
27 | - floatArguments.lightY = paintingData.lightVector.y(); | ||
28 | - floatArguments.lightZ = paintingData.lightVector.z(); | ||
29 | + floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); | ||
30 | + floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); | ||
31 | + floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); | ||
32 | floatArguments.padding2 = 1; | ||
33 | } | ||
34 | |||
35 | -- | ||
36 | 2.10.2 | ||
37 | |||
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 041ec4675f..d9a18e0ce9 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,4 +1,4 @@ | |||
1 | From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001 | 1 | From 322966273a8e085829261a397af37de0fbf51aad 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: Fri, 6 Oct 2017 17:00:08 +0300 | 3 | Date: Fri, 6 Oct 2017 17:00:08 +0300 |
4 | Subject: [PATCH] Fix build with musl | 4 | Subject: [PATCH] Fix build with musl |
@@ -7,69 +7,69 @@ 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 | --- |
10 | Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++- | 10 | Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- |
11 | Source/WTF/wtf/Platform.h | 2 +- | 11 | Source/WTF/wtf/Platform.h | 2 +- |
12 | 2 files changed, 18 insertions(+), 2 deletions(-) | 12 | 2 files changed, 6 insertions(+), 6 deletions(-) |
13 | 13 | ||
14 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h | 14 | diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h |
15 | index bf0bdc7..84b8a8a 100644 | 15 | index 836d755..7665d25 100644 |
16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h | 16 | --- a/Source/JavaScriptCore/runtime/MachineContext.h |
17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h | 17 | +++ b/Source/JavaScriptCore/runtime/MachineContext.h |
18 | @@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) | 18 | @@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) |
19 | #error Unknown Architecture | 19 | #error Unknown Architecture |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | -#elif defined(__GLIBC__) || defined(__BIONIC__) | 22 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
23 | +#elif defined(__linux__) | 23 | +#elif defined(__linux__) |
24 | 24 | ||
25 | #if CPU(X86) | 25 | #if CPU(X86) |
26 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); | 26 | return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
27 | @@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) | 27 | @@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) |
28 | #error Unknown Architecture | 28 | #error Unknown Architecture |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | -#elif defined(__GLIBC__) || defined(__BIONIC__) | 31 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
32 | +#elif defined(__linux__) | 32 | +#elif defined(__linux__) |
33 | 33 | ||
34 | // The following sequence depends on glibc's sys/ucontext.h. | 34 | // The following sequence depends on glibc's sys/ucontext.h. |
35 | #if CPU(X86) | 35 | #if CPU(X86) |
36 | @@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) | 36 | @@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) |
37 | #error Unknown Architecture | 37 | #error Unknown Architecture |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | -#elif defined(__GLIBC__) || defined(__BIONIC__) | 40 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
41 | +#elif defined(__linux__) | 41 | +#elif defined(__linux__) |
42 | 42 | ||
43 | // The following sequence depends on glibc's sys/ucontext.h. | 43 | // The following sequence depends on glibc's sys/ucontext.h. |
44 | #if CPU(X86) | 44 | #if CPU(X86) |
45 | @@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) | 45 | @@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
46 | #error Unknown Architecture | 46 | #error Unknown Architecture |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | -#elif defined(__GLIBC__) || defined(__BIONIC__) | 49 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
50 | +#elif defined(__linux__) | 50 | +#elif defined(__linux__) |
51 | 51 | ||
52 | // The following sequence depends on glibc's sys/ucontext.h. | 52 | // The following sequence depends on glibc's sys/ucontext.h. |
53 | #if CPU(X86) | 53 | #if CPU(X86) |
54 | @@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) | 54 | @@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
55 | #error Unknown Architecture | 55 | #error Unknown Architecture |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | -#elif defined(__GLIBC__) || defined(__BIONIC__) | 58 | -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
59 | +#elif defined(__linux__) | 59 | +#elif defined(__linux__) |
60 | 60 | ||
61 | // The following sequence depends on glibc's sys/ucontext.h. | 61 | // The following sequence depends on glibc's sys/ucontext.h. |
62 | #if CPU(X86) | 62 | #if CPU(X86) |
63 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h | 63 | diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h |
64 | index 551c047..e50b05a 100644 | 64 | index a841946..1e5c7dd 100644 |
65 | --- a/Source/WTF/wtf/Platform.h | 65 | --- a/Source/WTF/wtf/Platform.h |
66 | +++ b/Source/WTF/wtf/Platform.h | 66 | +++ b/Source/WTF/wtf/Platform.h |
67 | @@ -683,7 +683,7 @@ | 67 | @@ -701,7 +701,7 @@ |
68 | #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 | 68 | #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
69 | #endif | 69 | #endif |
70 | 70 | ||
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(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (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 | +#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 | 73 | #define HAVE_MACHINE_CONTEXT 1 |
74 | #endif | 74 | #endif |
75 | 75 | ||
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 923d00c4ba..3e03aa968c 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,4 +1,4 @@ | |||
1 | From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001 | 1 | From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 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] When building introspection files, add CMAKE_C_FLAGS to the |
@@ -11,14 +11,28 @@ 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 | --- |
14 | Source/WebKit/PlatformGTK.cmake | 4 ++-- | 14 | Source/JavaScriptCore/PlatformGTK.cmake | 2 +- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | Source/WebKit/PlatformGTK.cmake | 4 ++-- |
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
16 | 17 | ||
18 | diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake | ||
19 | index 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 | ||
17 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | 31 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake |
18 | index dc6b306..a074a80 100644 | 32 | index e36e4c35..943f9794 100644 |
19 | --- a/Source/WebKit/PlatformGTK.cmake | 33 | --- a/Source/WebKit/PlatformGTK.cmake |
20 | +++ b/Source/WebKit/PlatformGTK.cmake | 34 | +++ b/Source/WebKit/PlatformGTK.cmake |
21 | @@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION) | 35 | @@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) |
22 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 36 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
23 | DEPENDS WebKit | 37 | DEPENDS WebKit |
24 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 38 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
@@ -27,7 +41,7 @@ index dc6b306..a074a80 100644 | |||
27 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | 41 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" |
28 | ${INTROSPECTION_SCANNER} | 42 | ${INTROSPECTION_SCANNER} |
29 | --quiet | 43 | --quiet |
30 | @@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION) | 44 | @@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) |
31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | 45 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir |
32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | 46 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir |
33 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | 47 | DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir |
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch b/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch deleted file mode 100644 index a3f7599276..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Backport patch to fix CVE-2017-17821. Refer to | ||
2 | https://security-tracker.debian.org/tracker/CVE-2017-17821. | ||
3 | |||
4 | Upstream-Status: Backport [https://trac.webkit.org/changeset/232119/webkit] | ||
5 | CVE: CVE-2017-17821 | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | |||
9 | From 2a17b15297eb886b0bfb7d098ef607cfad6c3da0 Mon Sep 17 00:00:00 2001 | ||
10 | From: "mcatanzaro@igalia.com" | ||
11 | <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | ||
12 | Date: Wed, 23 May 2018 17:54:01 +0000 | ||
13 | Subject: [PATCH] Prohibit shrinking the FastBitVector | ||
14 | https://bugs.webkit.org/show_bug.cgi?id=181020 | ||
15 | |||
16 | Reviewed by Oliver Hunt. | ||
17 | |||
18 | Prohibit shrinking the FastBitVector. It's not prepared for this and the current usage does | ||
19 | not require it. | ||
20 | |||
21 | * wtf/FastBitVector.cpp: | ||
22 | (WTF::FastBitVectorWordOwner::resizeSlow): | ||
23 | |||
24 | git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232119 268f45cc-cd09-0410-ab3c-d52691b4dbfc | ||
25 | --- | ||
26 | Source/WTF/wtf/FastBitVector.cpp | 2 ++ | ||
27 | 2 files changed, 15 insertions(+) | ||
28 | |||
29 | diff --git a/Source/WTF/wtf/FastBitVector.cpp b/Source/WTF/wtf/FastBitVector.cpp | ||
30 | index eed316975f4..8b019aaa3ed 100644 | ||
31 | --- a/Source/WTF/wtf/FastBitVector.cpp | ||
32 | +++ b/Source/WTF/wtf/FastBitVector.cpp | ||
33 | @@ -42,6 +42,8 @@ void FastBitVectorWordOwner::setEqualsSlow(const FastBitVectorWordOwner& other) | ||
34 | void FastBitVectorWordOwner::resizeSlow(size_t numBits) | ||
35 | { | ||
36 | size_t newLength = fastBitVectorArrayLength(numBits); | ||
37 | + | ||
38 | + RELEASE_ASSERT(newLength >= arrayLength()); | ||
39 | |||
40 | // Use fastCalloc instead of fastRealloc because we expect the common | ||
41 | // use case for this method to be initializing the size of the bitvector. | ||
42 | -- | ||
43 | 2.17.0 | ||
44 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch deleted file mode 100644 index 78fd4dc79b..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 20 May 2018 14:28:27 -0700 | ||
4 | Subject: [PATCH] soup: Forward declare URL class | ||
5 | |||
6 | This helps getting away with compiler errors seen with clang | ||
7 | |||
8 | /mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: | ||
9 | error: unknown type name 'URL' | ||
10 | static std::optional<ResourceError> checkTLSErrors(const URL&, | ||
11 | GTlsCertificate*, GTlsCertificateFlags); | ||
12 | ^ | ||
13 | Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h | ||
21 | index 03bd72ba..7ca8792d 100644 | ||
22 | --- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h | ||
23 | +++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h | ||
24 | @@ -43,6 +43,7 @@ namespace WebCore { | ||
25 | |||
26 | class CertificateInfo; | ||
27 | class ResourceError; | ||
28 | +class URL; | ||
29 | struct SoupNetworkProxySettings; | ||
30 | |||
31 | class SoupNetworkSession { | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.22.3.bb index 7f1ffcea45..d06d2a1a69 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.22.3.bb | |||
@@ -20,13 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
20 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ | 20 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ |
21 | file://0001-Fix-build-with-musl.patch \ | 21 | file://0001-Fix-build-with-musl.patch \ |
22 | file://detect-gstreamer-gl.patch \ | 22 | file://detect-gstreamer-gl.patch \ |
23 | file://0012-soup-Forward-declare-URL-class.patch \ | ||
24 | file://0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch \ | ||
25 | file://0001-webkitgtk-fix-CVE-2017-17821.patch \ | ||
26 | " | 23 | " |
27 | 24 | ||
28 | SRC_URI[md5sum] = "72a05f6a4dc1c78b079590a8fd280401" | 25 | SRC_URI[md5sum] = "6dae6837c884a25413fb1d4527c9894a" |
29 | SRC_URI[sha256sum] = "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990" | 26 | SRC_URI[sha256sum] = "9dfd542902953be9af8ff32bd37fe662ca3d75f7348514ebac15c6252a6ccd72" |
30 | 27 | ||
31 | 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 |
32 | 29 | ||