diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch | |
parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
download | meta-qt5-5.13.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch new file mode 100644 index 00000000..a4cffc76 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | From 67c66a3af0a0268f1ab9a9af47d002cd75b57ca1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | ||
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
12 | index 13aa415e250..9d1309b836f 100644 | ||
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | ||
15 | @@ -154,6 +154,7 @@ extern "C" { | ||
16 | #include <stddef.h> | ||
17 | #include <stdint.h> | ||
18 | #include <string.h> | ||
19 | +#include <fcntl.h> | ||
20 | #include <sys/ptrace.h> | ||
21 | #include <sys/resource.h> | ||
22 | #include <sys/time.h> | ||