summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-23 16:03:15 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-04-23 16:14:34 +0300
commit8acb105762bd239063f63d3c8ac23b91bddb23c5 (patch)
treeac7d4ab8a6cb13fea4c30da5ee2d5e71de2d0c2b /recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
parentbfa0b787902fb791bc49e38572ee387a2e9913f0 (diff)
parentd6b6838e55aae46699e4dbdc24c13bc405e94f32 (diff)
downloadmeta-qt5-8acb105762bd239063f63d3c8ac23b91bddb23c5.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.15
- Several modules are actually newer than beta4 in upstream, hence the conflicts with SRCREVs. - Replaced/removed local QPainterPath patches for qwt & creator with upstream ones. - Updated the qtwebkit SRCREV to sync with upstream as it switched to same "5.212" branch as locally already, but kept the riscv patch * upstream/master: d6b6838e qt5: upgrade to 5.15 beta4 05b3e648 qtwebkit: Switch to 5.212 branch abed512f qt5-creator: Upgrade to 4.12 branch 32c62abe qwt-qt5: fix build with Qt 5.15 44fc90ee gstreamer1.0-plugins-good: Reemove inserting qt5 from packageconfig Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-creator_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qwt/qwt-qt5_6.1.4.bb Change-Id: Icf6e747da78059c23568ea00ebbe50b28588aa3f
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 3c211ca4..fd9301a8 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
1From 1f4c9aaaa625ed6c4a84eed9bed143de056d3535 Mon Sep 17 00:00:00 2001 1From 18af47b85fb13b6e9f1d88a8beb3c01745c75ebb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800 3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: stack pointer clobber 4Subject: [PATCH] chromium: stack pointer clobber
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 3 insertions(+), 3 deletions(-) 17 1 file changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index 9276f5627af..622cc1fbf7e 100644 20index 8e0cc385792..d2bd9df4d40 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h 21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h 22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -2012,7 +2012,7 @@ struct kernel_statfs { 23@@ -2012,7 +2012,7 @@ struct kernel_statfs {