[oe] [oe-core][zeus][PATCH 1/1] webkitgtk: fix occasional link error

[akuster808]

got it.


On 1/28/20 2:10 PM, Randy MacLeod wrote:
> On 1/28/20 4:34 PM, Randy MacLeod wrote:
>> Armin,
>>
>> ping? It's not urgent but it would be nice to fix this build failure.
>
>
> Ah, it was sent to the wrong list.
>
> Joe,
>
> Could you send this patch to the oe-core list and CC Armin, please?
sorry , found original in my trash. its in zeus-nut now

thanks for bringing to my attention.

- armin
>
> ../Randy
>
>>
>> ../Randy
>>
>>
>> On 11/7/19 1:13 PM, Joe Slater wrote:
>>> Partial backport from WebKit.git.  See patch for details.
>>>
>>> Fixed in webkitgtk 2.26.1.
>>>
>>> Signed-off-by: Joe Slater <joe.slater at windriver.com>
>>> ---
>>>   .../webkit/webkitgtk/fix-link-error.patch          | 45
>>> ++++++++++++++++++++++
>>>   meta/recipes-sato/webkit/webkitgtk_2.24.4.bb       |  1 +
>>>   2 files changed, 46 insertions(+)
>>>   create mode 100755
>>> meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch
>>>
>>> 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 0000000..9696ddd
>>> --- /dev/null
>>> +++ b/meta/recipes-sato/webkit/webkitgtk/fix-link-error.patch
>>> @@ -0,0 +1,45 @@
>>> +webkitgtk: fix an occasional link error
>>> +
>>> +Part of ae465a4e...  Changelog is not included in the source tarball.
>>> +
>>> +Upstream-Status:  backport [git://git.webkit.org/WebKit.git]
>>> +
>>> +commit ae465a4e3b1498b6c4038fc7e596e0e3662d116f
>>> +Author: Hironori.Fujii at sony.com
>>> <Hironori.Fujii at sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
>>> +Date:   Fri Jun 28 07:38:09 2019 +0000
>>> +
>>> +    [Win] unresolved external symbol
>>> "JSC::JSObject::didBecomePrototype(void)" referenced in function
>>> "JSC::Structure::create(...)"
>>> +    https://bugs.webkit.org/show_bug.cgi?id=199312
>>> +
>>> +    Reviewed by Keith Miller.
>>> +
>>> +    WinCairo port, clang-cl Release builds reported a following
>>> linkage error:
>>> +
>>> +    > WebCore.lib(UnifiedSource-4babe430-10.cpp.obj) : error
>>> LNK2019: unresolved external symbol "public: void __cdecl
>>> JSC::JSObject::didBecomePrototype(void)"
>>> (?didBecomePrototype at 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 at Structure@JSC@@SAPEAV12 at AEAVVM@2 at PEAVJSGlobalObject@2 at VJSValue@2 at AEBVTypeInfo@2 at PEBUClassInfo@2 at EI@Z)
>>> +
>>> +    No new tests because there is no behavior change.
>>> +
>>> +    * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Include
>>> <JavaScriptCore/JSCInlines.h>,
>>> +    and do not include headers which is included by it.
>>> +
>>> +    git-svn-id:
>>> http://svn.webkit.org/repository/webkit/trunk@246922
>>> 268f45cc-cd09-0410-ab3c-d52691b4dbfc
>>> +
>>> +[ modification of Changelog deleted ]
>>> +
>>> +diff --git
>>> a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
>>> b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
>>> +index d1b047c..0899a9a 100644
>>> +---
>>> a/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
>>> ++++
>>> b/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
>>> +@@ -49,11 +49,8 @@
>>> + #include "SQLiteTransaction.h"
>>> + #include "ThreadSafeDataBuffer.h"
>>> + #include <JavaScriptCore/AuxiliaryBarrierInlines.h>
>>> +-#include <JavaScriptCore/HeapInlines.h>
>>> +-#include <JavaScriptCore/JSCJSValueInlines.h>
>>> +-#include <JavaScriptCore/JSGlobalObject.h>
>>> ++#include <JavaScriptCore/JSCInlines.h>
>>> + #include <JavaScriptCore/StrongInlines.h>
>>> +-#include <JavaScriptCore/StructureInlines.h>
>>> + #include <wtf/FileSystem.h>
>>> + #include <wtf/NeverDestroyed.h>
>>> + #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 8c695ce..b04ec82 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 =
>>> "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
>>>              file://include_array.patch \
>>>              file://narrowing.patch \
>>> file://0001-gstreamer-add-a-missing-format-string.patch \
>>> +           file://fix-link-error.patch \
>>>              "
>>>     SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
>>
>>
>