diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-05 18:32:03 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:00:21 +0000 |
| commit | 3acae2dcd130122fe76504ec855af78db829d6ec (patch) | |
| tree | bd97908b27178b5c4b2b74d1b47123c0f4fb621d /meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | |
| parent | a4ed9c687f882caa6abbd2005eca35849add0336 (diff) | |
| download | openembedded-core-contrib-3acae2dcd130122fe76504ec855af78db829d6ec.tar.gz | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | 48 |
1 files changed, 0 insertions, 48 deletions
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 @@ -Replace __GLIBC__ with __linux__ since musl also supports it -so checking __linux__ is more accomodating - -See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp -=================================================================== ---- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) && ENABLE(JIT) -+#elif defined(__linux__) && ENABLE(JIT) - - #if CPU(X86) - return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); -@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers: - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) -+#elif defined(__linux__) // glibc and musl - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) |