diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:51:05 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:06:37 +0000 |
commit | f33be06035faaa59cee17e5a97e82d079b4ab444 (patch) | |
tree | 79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch | |
parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) | |
download | meta-qt5-f33be06035faaa59cee17e5a97e82d079b4ab444.tar.gz |
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
removed from qtbase in:
commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
Author: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri Oct 6 16:27:09 2017 +0200
Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
qtvirtualkeyboard: add qtdeclarative-native dependency
needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
referenced files disappered in:
commit 6882a04fb36642862b11efe514251d32070c3d65
Author: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu Aug 25 19:20:41 2016 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch deleted file mode 100644 index 7be83c55..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From ce23b6a6e5a5ebae15dedeebf7044ac9a0249a80 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:24:49 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Match syscalls to match musl | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ | ||
9 | 1 file changed, 16 insertions(+) | ||
10 | |||
11 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
12 | index 80a3e56..1e57b1a 100644 | ||
13 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
14 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
15 | @@ -794,6 +794,14 @@ struct kernel_statfs { | ||
16 | #endif | ||
17 | |||
18 | |||
19 | +#undef stat64 | ||
20 | +#undef fstat64 | ||
21 | + | ||
22 | +#ifndef __NR_fstatat | ||
23 | +#define __NR_fstatat __NR_fstatat64 | ||
24 | +#endif | ||
25 | + | ||
26 | + | ||
27 | #if defined(__x86_64__) | ||
28 | #ifndef ARCH_SET_GS | ||
29 | #define ARCH_SET_GS 0x1001 | ||
30 | @@ -1211,6 +1219,14 @@ struct kernel_statfs { | ||
31 | #ifndef __NR_fallocate | ||
32 | #define __NR_fallocate 285 | ||
33 | #endif | ||
34 | + | ||
35 | +#ifndef __NR_pread | ||
36 | +#define __NR_pread __NR_pread64 | ||
37 | +#endif | ||
38 | +#ifndef __NR_pwrite | ||
39 | +#define __NR_pwrite __NR_pwrite64 | ||
40 | +#endif | ||
41 | + | ||
42 | /* End of x86-64 definitions */ | ||
43 | #elif defined(__mips__) | ||
44 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | ||