summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-sato/webkit/webkitgtk/fix-link-error.patch45
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.24.4.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch
new file mode 100755
index 0000000000..9696ddd691
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch
@@ -0,0 +1,45 @@
1webkitgtk: fix an occasional link error
2
3Part of ae465a4e... Changelog is not included in the source tarball.
4
5Upstream-Status: backport [git://git.webkit.org/WebKit.git]
6
7commit ae465a4e3b1498b6c4038fc7e596e0e3662d116f
8Author: Hironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
9Date: Fri Jun 28 07:38:09 2019 +0000
10
11 [Win] unresolved external symbol "JSC::JSObject::didBecomePrototype(void)" referenced in function "JSC::Structure::create(...)"
12 https://bugs.webkit.org/show_bug.cgi?id=199312
13
14 Reviewed by Keith Miller.
15
16 WinCairo port, clang-cl Release builds reported a following linkage error:
17
18 > WebCore.lib(UnifiedSource-4babe430-10.cpp.obj) : error LNK2019: unresolved external symbol "public: void __cdecl JSC::JSObject::didBecomePrototype(void)" (?didBecomePrototype@JSObject@JSC@@QEAAXXZ) referenced in function "public: static class JSC::Structure * __cdecl JSC::Structure::create(class JSC::VM &,class JSC::JSGlobalObject *,class JSC::JSValue,class JSC::TypeInfo const &,struct JSC::ClassInfo const *,unsigned char,unsigned int)" (?create@Structure@JSC@@SAPEAV12@AEAVVM@2@PEAVJSGlobalObject@2@VJSValue@2@AEBVTypeInfo@2@PEBUClassInfo@2@EI@Z)
19
20 No new tests because there is no behavior change.
21
22 * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Include <JavaScriptCore/JSCInlines.h>,
23 and do not include headers which is included by it.
24
25 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@246922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
26
27[ modification of Changelog deleted ]
28
29diff --git a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
30index d1b047c..0899a9a 100644
31--- a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
32+++ b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
33@@ -49,11 +49,8 @@
34 #include "SQLiteTransaction.h"
35 #include "ThreadSafeDataBuffer.h"
36 #include <JavaScriptCore/AuxiliaryBarrierInlines.h>
37-#include <JavaScriptCore/HeapInlines.h>
38-#include <JavaScriptCore/JSCJSValueInlines.h>
39-#include <JavaScriptCore/JSGlobalObject.h>
40+#include <JavaScriptCore/JSCInlines.h>
41 #include <JavaScriptCore/StrongInlines.h>
42-#include <JavaScriptCore/StructureInlines.h>
43 #include <wtf/FileSystem.h>
44 #include <wtf/NeverDestroyed.h>
45 #include <wtf/text/StringConcatenateNumbers.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
index c090782411..1c71762945 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
@@ -23,6 +23,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
23 file://include_array.patch \ 23 file://include_array.patch \
24 file://narrowing.patch \ 24 file://narrowing.patch \
25 file://0001-gstreamer-add-a-missing-format-string.patch \ 25 file://0001-gstreamer-add-a-missing-format-string.patch \
26 file://fix-link-error.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" 29SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"