[meta-freescale] [PATCH] chromium-wayland: Fix crash on tab loading

[Tom Hochstein]

Hi Alexandra,

This patch should go directly to meta-browser. We also need to provide updated bbappends for meta-freescale.

Tom

-----Original Message-----
From: Alexandra Safta [mailto:alexandra-ioana.safta at nxp.com] 
Sent: Friday, May 05, 2017 10:58 AM
To: meta-freescale at yoctoproject.org
Cc: Alexandra-ioana Safta <alexandra-ioana.safta at nxp.com>; Tom Hochstein <tom.hochstein at nxp.com>
Subject: [meta-freescale][PATCH] chromium-wayland: Fix crash on tab loading

A SIGILL, Illegal instruction signal was crashing every
chrome tab. It seems we share a common file with qtwebengine, and
the same problem when using a newer Linux was addressed here:

https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fcode.qt.io%2Fcgit%2Fqt%2Fqtwebengine-chromium.git%2Fcommit%2F%3Fh%3D49-based%26id%3Db12ffcd411d4776f7120ccecb3be34344d930d2b&data=01%7C01%7Ctom.hochstein%40nxp.com%7C8de85029f83a47fd041008d493cf8fb2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=j4joHBykytZITvCK7AjcalimBDd56%2FYUZ3yrSuqvrmU%3D&reserved=0

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com> 
Signed-off-by: Alexandra Safta <alexandra-ioana.safta at nxp.com>

---
 .../chromium/chromium-wayland_53.0.2785.143.bbappend     |  1 +
 .../chromium/chromium/Fix-chromium-xwayland-crash.patch  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 dynamic-layers/browser-layer/recipes-browser/chromium/chromium/Fix-chromium-xwayland-crash.patch

diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bbappend
index 7423753..135d094 100644
--- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bbappend
+++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bbappend
@@ -23,6 +23,7 @@ CHROMIUM_ENABLE_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '1
 SRC_URI += "\
         ${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', 'git://github.com/01org/ozone-wayland.git;destsuffix=${OZONE_WAYLAND_GIT_DESTSUFFIX};branch=${OZONE_WAYLAND_GIT_BRANCH};rev=${OZONE_WAYLAND_GIT_SRCREV}', '', d)} \
         ${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', ' file://chromium.patch', '', d)} \
+        ${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', ' file://Fix-chromium-xwayland-crash.patch', '', d)} \
 "
 
 # Remove packages as Chromium is changed to statically link against ffmpeg.
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/Fix-chromium-xwayland-crash.patch b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/Fix-chromium-xwayland-crash.patch
new file mode 100644
index 0000000..6b4f701
--- /dev/null
+++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/Fix-chromium-xwayland-crash.patch
@@ -0,0 +1,16 @@
+Index: chromium-53.0.2785.143/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
+===================================================================
+--- chromium-53.0.2785.143.orig/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-09-29 14:02:41.000000000 -0500
++++ chromium-53.0.2785.143/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2017-03-29 00:10:45.457871886 -0500
+@@ -41,6 +41,11 @@
+ #include <errno.h>
+ #include <sys/mman.h>
+ 
++#if OS(LINUX) && defined(MADV_FREE)
++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
++#undef MADV_FREE
++#endif
++
+ #ifndef MADV_FREE
+ #define MADV_FREE MADV_DONTNEED
+ #endif
-- 
2.1.4