[oe] [meta-browser][PATCH 3/3] chromium: Upgrade to version 48.0.2548.0
Martin Jansa
martin.jansa at gmail.com
Tue May 3 07:36:42 UTC 2016
Hi,
fails to build in world for qemux86-64:
http://errors.yoctoproject.org/Errors/Details/61475/
On Sun, May 1, 2016 at 10:50 AM, Carlos Rafael Giani <dv at pseudoterminal.org>
wrote:
> Not upgrading to M49 or M50 in this commit since this is currently the
> latest version that is supported by ozone-wayland
>
> Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> ---
> ...Add-Linux-to-impl-side-painting-whitelist.patch | 39 -----------
> .../0003-disable-uninitialized-warning.patch | 19 ------
> .../0005-Remove-X-libraries-from-GYP-files.patch | 77
> ----------------------
> .../chromium/chromium-40/0010-systemd-218.patch | 39 -----------
> .../fix-build-error-with-GCC-in-Debug-mode.patch | 32 ---------
> ...accelerated-Canvas-support-from-blacklist.patch | 20 ++++--
> ...0001-bignum.cc-disable-warning-from-gcc-5.patch | 4 +-
> .../0002-Disable-API-keys-info-bar.patch} | 2 +-
> ...-image_util.cc-disable-warning-from-gcc-5.patch | 0
> ...-Remove-hard-coded-values-for-CC-and-CXX.patch} | 8 +--
> ...y-i18n_process_css_test.html-file-to-avoi.patch | 26 ++++++++
> ...erride-root-filesystem-access-restriction.patch | 30 +++++++++
> .../0006-Remove-GBM-support-from-wayland.gyp.patch | 66
> +++++++++++++++++++
> ...for-glib-related-build-error-with-ozone-w.patch | 31 +++++++++
> .../0008-Fix-GCC-uninitialized-warning.patch | 26 ++++++++
> ...9-Fix-build-errors-with-GCC-in-Debug-mode.patch | 46 +++++++++++++
> .../add_missing_stat_h_include.patch | 4 +-
> recipes-browser/chromium/chromium_40.0.2214.91.bb | 45 -------------
> recipes-browser/chromium/chromium_48.0.2548.0.bb | 42 ++++++++++++
> 19 files changed, 289 insertions(+), 267 deletions(-)
> delete mode 100644
> recipes-browser/chromium/chromium/chromium-40/0002-Add-Linux-to-impl-side-painting-whitelist.patch
> delete mode 100644
> recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch
> delete mode 100644
> recipes-browser/chromium/chromium/chromium-40/0005-Remove-X-libraries-from-GYP-files.patch
> delete mode 100644
> recipes-browser/chromium/chromium/chromium-40/0010-systemd-218.patch
> delete mode 100644
> recipes-browser/chromium/chromium/chromium-40/fix-build-error-with-GCC-in-Debug-mode.patch
> rename recipes-browser/chromium/chromium/{chromium-40 =>
> chromium-48}/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> (71%)
> rename recipes-browser/chromium/chromium/{chromium-40 =>
> chromium-48}/0001-bignum.cc-disable-warning-from-gcc-5.patch (98%)
> rename
> recipes-browser/chromium/chromium/{chromium-40/0003-Disable-API-keys-info-bar.patch
> => chromium-48/0002-Disable-API-keys-info-bar.patch} (95%)
> rename recipes-browser/chromium/chromium/{chromium-40 =>
> chromium-48}/0002-image_util.cc-disable-warning-from-gcc-5.patch (100%)
> rename
> recipes-browser/chromium/chromium/{chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch
> => chromium-48/0003-Remove-hard-coded-values-for-CC-and-CXX.patch} (86%)
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0005-Override-root-filesystem-access-restriction.patch
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0006-Remove-GBM-support-from-wayland.gyp.patch
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0008-Fix-GCC-uninitialized-warning.patch
> create mode 100644
> recipes-browser/chromium/chromium/chromium-48/0009-Fix-build-errors-with-GCC-in-Debug-mode.patch
> rename recipes-browser/chromium/chromium/{chromium-40 =>
> chromium-48}/add_missing_stat_h_include.patch (90%)
> delete mode 100644 recipes-browser/chromium/chromium_40.0.2214.91.bb
> create mode 100644 recipes-browser/chromium/chromium_48.0.2548.0.bb
>
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0002-Add-Linux-to-impl-side-painting-whitelist.patch
> b/recipes-browser/chromium/chromium/chromium-40/0002-Add-Linux-to-impl-side-painting-whitelist.patch
> deleted file mode 100644
> index b5916ca..0000000
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0002-Add-Linux-to-impl-side-painting-whitelist.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 61cbd67e88f5e99185d7df1a05f842c58e691495 Mon Sep 17 00:00:00 2001
> -From: Carlos Rafael Giani <dv at pseudoterminal.org>
> -Date: Sun, 21 Dec 2014 01:01:04 +0100
> -Subject: [PATCH] Add Linux to impl side painting whitelist
> -
> -Upstream-Status: Inappropriate [enable feature]
> -
> -Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> ----
> - gpu/config/software_rendering_list_json.cc | 7 ++++++-
> - 1 file changed, 6 insertions(+), 1 deletion(-)
> -
> -diff --git a/gpu/config/software_rendering_list_json.cc
> b/gpu/config/software_rendering_list_json.cc
> -index ccf1460..8630d75 100644
> ---- a/gpu/config/software_rendering_list_json.cc
> -+++ b/gpu/config/software_rendering_list_json.cc
> -@@ -1088,13 +1088,18 @@ LONG_STRING_CONST(
> - },
> - {
> - "id": 99,
> -- "description": "GPU rasterization is blacklisted on non-Android",
> -+ "description": "GPU rasterization is blacklisted on non-Android
> and non-Linux (Yocto patch)",
> - "cr_bugs": [362779],
> - "exceptions": [
> - {
> - "os": {
> - "type": "android"
> - }
> -+ },
> -+ {
> -+ "os": {
> -+ "type": "linux"
> -+ }
> - }
> - ],
> - "features": [
> ---
> -1.9.1
> -
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch
> b/recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch
> deleted file mode 100644
> index 232dbf4..0000000
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp:
> In static member function 'static void
> WTF::HashTableBucketInitializer<false>::initialize(Value&) [with Traits =
> WTF::HashMapValueTraits<WTF::HashTraits<int>,
> WTF::HashTraits<blink::TimelineThreadState> >; Value =
> WTF::KeyValuePair<int, blink::TimelineThreadState>]':
> -../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp:234:8:
> error: '<anonymous>.blink::TimelineThreadState::inKnownLayerTask' is used
> uninitialized in this function [-Werror=uninitialized]
> - struct TimelineThreadState {
> - ^
> -
> ----
> a/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp
> 2016-03-10 08:14:18.771413000 -1000
> -+++
> b/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp
> 2016-03-10 08:15:58.179413000 -1000
> -@@ -231,7 +231,11 @@
> - Vector<Entry> m_stack;
> - };
> -
> -+#pragma GCC diagnostic push
> -+#pragma GCC diagnostic warning "-Wuninitialized"
> - struct TimelineThreadState {
> -+#pragma GCC diagnostic pop
> -+
> - ALLOW_ONLY_INLINE_ALLOCATION();
> - public:
> - TimelineThreadState() { }
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0005-Remove-X-libraries-from-GYP-files.patch
> b/recipes-browser/chromium/chromium/chromium-40/0005-Remove-X-libraries-from-GYP-files.patch
> deleted file mode 100644
> index 632590a..0000000
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0005-Remove-X-libraries-from-GYP-files.patch
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -From 23e33854a1c5cddc56acd9abdbda14757b809c7d Mon Sep 17 00:00:00 2001
> -From: Carlos Rafael Giani <dv at pseudoterminal.org>
> -Date: Sun, 12 Oct 2014 18:08:37 +0200
> -Subject: [PATCH] Remove X libraries from GYP files
> -
> -Some X libraries are linked even when ozone-wayland is used, causing
> -linker errors if no X libraries are around
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> ----
> - third_party/libjingle/source/talk/libjingle.gyp | 2 --
> - third_party/libjingle/source/talk/libjingle_examples.gyp | 4 ----
> - third_party/webrtc/base/base.gyp | 4 ----
> - third_party/webrtc/modules/desktop_capture/desktop_capture.gypi | 2 +-
> - 4 files changed, 1 insertion(+), 11 deletions(-)
> -
> -diff --git a/third_party/libjingle/source/talk/libjingle.gyp
> b/third_party/libjingle/source/talk/libjingle.gyp
> -index 90d1f41..22655dc 100755
> ---- a/third_party/libjingle/source/talk/libjingle.gyp
> -+++ b/third_party/libjingle/source/talk/libjingle.gyp
> -@@ -455,8 +455,6 @@
> - ],
> - 'libraries': [
> - '-lrt',
> -- '-lXext',
> -- '-lX11',
> - ],
> - }],
> - ['OS=="win"', {
> -diff --git a/third_party/libjingle/source/talk/libjingle_examples.gyp
> b/third_party/libjingle/source/talk/libjingle_examples.gyp
> -index f7ce53b..204bc1e 100755
> ---- a/third_party/libjingle/source/talk/libjingle_examples.gyp
> -+++ b/third_party/libjingle/source/talk/libjingle_examples.gyp
> -@@ -207,10 +207,6 @@
> - 'libraries': [
> - '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0'
> - ' gthread-2.0 gtk+-2.0)',
> -- '-lX11',
> -- '-lXcomposite',
> -- '-lXext',
> -- '-lXrender',
> - ],
> - },
> - }], # OS=="linux"
> -diff --git a/third_party/webrtc/base/base.gyp
> b/third_party/webrtc/base/base.gyp
> -index 2fd64ba..ccab4e9 100644
> ---- a/third_party/webrtc/base/base.gyp
> -+++ b/third_party/webrtc/base/base.gyp
> -@@ -593,10 +593,6 @@
> - 'libraries': [
> - '-ldl',
> - '-lrt',
> -- '-lXext',
> -- '-lX11',
> -- '-lXcomposite',
> -- '-lXrender',
> - ],
> - },
> - }, {
> -diff --git
> a/third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
> b/third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
> -index 1b702f2..93ede57 100644
> ---- a/third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
> -+++ b/third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
> -@@ -97,7 +97,7 @@
> - 'desktop_capture_differ_sse2',
> - ],
> - }],
> -- ['use_x11 == 1', {
> -+ ['use_x11 == 1 and <(ozone_platform_wayland) != 1', {
> - 'link_settings': {
> - 'libraries': [
> - '-lX11',
> ---
> -1.9.1
> -
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0010-systemd-218.patch
> b/recipes-browser/chromium/chromium/chromium-40/0010-systemd-218.patch
> deleted file mode 100644
> index 3aec8d0..0000000
> --- a/recipes-browser/chromium/chromium/chromium-40/0010-systemd-218.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -Remove use of udev_set_log_priority API its gone in systemd >= 218
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> -
> -Index:
> chromium-40.0.2214.91/ui/events/ozone/device/udev/device_manager_udev.cc
> -===================================================================
> ----
> chromium-40.0.2214.91.orig/ui/events/ozone/device/udev/device_manager_udev.cc
> -+++
> chromium-40.0.2214.91/ui/events/ozone/device/udev/device_manager_udev.cc
> -@@ -33,29 +33,9 @@ enum {
> - SYS_LOG_DEBUG = 7,
> - };
> -
> --// Log handler for messages generated from libudev.
> --void UdevLog(struct udev* udev,
> -- int priority,
> -- const char* file,
> -- int line,
> -- const char* fn,
> -- const char* format,
> -- va_list args) {
> -- if (priority <= SYS_LOG_ERR)
> -- LOG(ERROR) << "libudev: " << fn << ": " <<
> base::StringPrintV(format, args);
> -- else if (priority <= SYS_LOG_INFO)
> -- VLOG(1) << "libudev: " << fn << ": " << base::StringPrintV(format,
> args);
> -- else // SYS_LOG_DEBUG
> -- VLOG(2) << "libudev: " << fn << ": " << base::StringPrintV(format,
> args);
> --}
> --
> - // Create libudev context.
> - device::ScopedUdevPtr UdevCreate() {
> - struct udev* udev = udev_new();
> -- if (udev) {
> -- udev_set_log_fn(udev, UdevLog);
> -- udev_set_log_priority(udev, SYS_LOG_DEBUG);
> -- }
> - return device::ScopedUdevPtr(udev);
> - }
> -
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/fix-build-error-with-GCC-in-Debug-mode.patch
> b/recipes-browser/chromium/chromium/chromium-40/fix-build-error-with-GCC-in-Debug-mode.patch
> deleted file mode 100644
> index c05598a..0000000
> ---
> a/recipes-browser/chromium/chromium/chromium-40/fix-build-error-with-GCC-in-Debug-mode.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From bfe80ed5227fccf8ab13df714702fc77e5e3d657 Mon Sep 17 00:00:00 2001
> -From: Carlos Alberto Lopez Perez <clopez at igalia.com>
> -Date: Thu, 27 Aug 2015 09:54:06 +0200
> -Subject: [PATCH] Fix build error with GCC in Debug mode:
> -
> - http://code.google.com/p/chromium/issues/detail?id=525428
> ----
> - components/invalidation/invalidator_storage.cc | 7 +++++++
> - 1 file changed, 7 insertions(+)
> -
> -diff --git a/components/invalidation/invalidator_storage.cc
> b/components/invalidation/invalidator_storage.cc
> -index 13ba4b1..3d567c1 100644
> ---- a/components/invalidation/invalidator_storage.cc
> -+++ b/components/invalidation/invalidator_storage.cc
> -@@ -2,7 +2,14 @@
> - // Use of this source code is governed by a BSD-style license that can be
> - // found in the LICENSE file.
> -
> -+#if !defined(NDEBUG)
> -+#pragma GCC diagnostic push
> -+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
> -+#endif // !defined(NDEBUG)
> - #include "components/invalidation/invalidator_storage.h"
> -+#if !defined(NDEBUG)
> -+#pragma GCC diagnostic pop
> -+#endif // !defined(NDEBUG)
> -
> - #include <string>
> - #include <utility>
> ---
> -2.1.4
> -
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> b/recipes-browser/chromium/chromium/chromium-48/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> similarity index 71%
> rename from
> recipes-browser/chromium/chromium/chromium-40/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> index e2c1a5c..2d7bf84 100644
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0001-Remove-accelerated-Canvas-support-from-blacklist.patch
> @@ -1,6 +1,6 @@
> -From 821d9fde2302f68f7cb7f0b211f4f78220c97180 Mon Sep 17 00:00:00 2001
> +From be6f1d02f3f784594642929dff289dae33014d56 Mon Sep 17 00:00:00 2001
> From: Carlos Rafael Giani <dv at pseudoterminal.org>
> -Date: Sun, 12 Oct 2014 17:54:18 +0200
> +Date: Sun, 3 Apr 2016 17:46:59 +0200
> Subject: [PATCH] Remove accelerated Canvas support from blacklist
>
> Together with the --gpu-no-context-lost command line switch, this patch is
> @@ -14,14 +14,14 @@
> http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2012-September/206450.html
>
> Upstream-Status: Inappropiate [see link above]
> ---
> - gpu/config/software_rendering_list_json.cc | 10 ----------
> - 1 file changed, 10 deletions(-)
> + gpu/config/software_rendering_list_json.cc | 16 ----------------
> + 1 file changed, 16 deletions(-)
>
> diff --git a/gpu/config/software_rendering_list_json.cc
> b/gpu/config/software_rendering_list_json.cc
> -index b9f5e3a..ccf1460 100644
> +index 484467d..c3b5855 100644
> --- a/gpu/config/software_rendering_list_json.cc
> +++ b/gpu/config/software_rendering_list_json.cc
> -@@ -240,16 +240,6 @@ const char kSoftwareRenderingListJson[] =
> LONG_STRING_CONST(
> +@@ -240,22 +240,6 @@ const char kSoftwareRenderingListJson[] =
> LONG_STRING_CONST(
> ]
> },
> {
> @@ -30,6 +30,12 @@ index b9f5e3a..ccf1460 100644
> - "os": {
> - "type": "linux"
> - },
> +- "exceptions": [
> +- {
> +- "gl_vendor": "Vivante Corporation",
> +- "gl_renderer": "Vivante GC1000"
> +- }
> +- ],
> - "features": [
> - "accelerated_2d_canvas"
> - ]
> @@ -39,5 +45,5 @@ index b9f5e3a..ccf1460 100644
> "description": "ATI/AMD cards with older drivers in Linux are
> crash-prone",
> "cr_bugs": [95934, 94973, 136240, 357314],
> --
> -1.9.1
> +2.5.0
>
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0001-bignum.cc-disable-warning-from-gcc-5.patch
> b/recipes-browser/chromium/chromium/chromium-48/0001-bignum.cc-disable-warning-from-gcc-5.patch
> similarity index 98%
> rename from
> recipes-browser/chromium/chromium/chromium-40/0001-bignum.cc-disable-warning-from-gcc-5.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/0001-bignum.cc-disable-warning-from-gcc-5.patch
> index 86691a5..67f9800 100644
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0001-bignum.cc-disable-warning-from-gcc-5.patch
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0001-bignum.cc-disable-warning-from-gcc-5.patch
> @@ -34,7 +34,7 @@ index a000b46..6c6d336 100644
> // 2^64 = 18446744073709551616 > 10^19
> const int kMaxUint64DecimalDigits = 19;
> Zero();
> -@@ -699,7 +699,10 @@
> +@@ -696,7 +696,10 @@
> }
>
>
> @@ -45,7 +45,7 @@ index a000b46..6c6d336 100644
> if (exponent_ > other.exponent_) {
> // If "X" represents a "hidden" digit (by the exponent) then
> we are in the
> // following case (a == this, b == other):
> -@@ -715,7 +715,10 @@
> +@@ -709,7 +709,10 @@
> for (int i = used_digits_ - 1; i >= 0; --i) {
> bigits_[i + zero_digits] = bigits_[i];
> }
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0003-Disable-API-keys-info-bar.patch
> b/recipes-browser/chromium/chromium/chromium-48/0002-Disable-API-keys-info-bar.patch
> similarity index 95%
> rename from
> recipes-browser/chromium/chromium/chromium-40/0003-Disable-API-keys-info-bar.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/0002-Disable-API-keys-info-bar.patch
> index f36fc24..56a5b28 100644
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0003-Disable-API-keys-info-bar.patch
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0002-Disable-API-keys-info-bar.patch
> @@ -22,7 +22,7 @@ index edea11a..4aef68f 100644
> return;
>
> +#if 0
> - infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
> + infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
> scoped_ptr<ConfirmInfoBarDelegate>(new
> GoogleApiKeysInfoBarDelegate())));
> +#endif
> }
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0002-image_util.cc-disable-warning-from-gcc-5.patch
> b/recipes-browser/chromium/chromium/chromium-48/0002-image_util.cc-disable-warning-from-gcc-5.patch
> similarity index 100%
> rename from
> recipes-browser/chromium/chromium/chromium-40/0002-image_util.cc-disable-warning-from-gcc-5.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/0002-image_util.cc-disable-warning-from-gcc-5.patch
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch
> b/recipes-browser/chromium/chromium/chromium-48/0003-Remove-hard-coded-values-for-CC-and-CXX.patch
> similarity index 86%
> rename from
> recipes-browser/chromium/chromium/chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/0003-Remove-hard-coded-values-for-CC-and-CXX.patch
> index 402a674..7bc8d14 100644
> ---
> a/recipes-browser/chromium/chromium/chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0003-Remove-hard-coded-values-for-CC-and-CXX.patch
> @@ -21,13 +21,13 @@ diff --git a/build/common.gypi b/build/common.gypi
> index 7ec5ae2..11e8d1d 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> -@@ -5808,16 +5808,6 @@
> +@@ -6047,16 +6047,6 @@
> ['CXX.host', '<(host_cxx)'],
> ],
> }],
> - ['OS=="linux" and target_arch=="arm" and host_arch!="arm" and
> chromeos==0 and clang==0', {
> -- # Set default ARM cross compiling on linux. These can be
> overridden
> -- # using CC/CXX/etc environment variables.
> +- # Set default ARM cross tools on linux. These can be overridden
> +- # using CC,CXX,CC.host and CXX.host environment variables.
> - 'make_global_settings': [
> - ['CC', '<!(which arm-linux-gnueabihf-gcc)'],
> - ['CXX', '<!(which arm-linux-gnueabihf-g++)'],
> @@ -35,9 +35,9 @@ index 7ec5ae2..11e8d1d 100644
> - ['CXX.host', '<(host_cxx)'],
> - ],
> - }],
> -
> # TODO(yyanagisawa): supports GENERATOR==make
> # make generator doesn't support CC_wrapper without CC
> + # in make_global_settings yet.
> --
> 1.9.1
>
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch
> b/recipes-browser/chromium/chromium/chromium-48/0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch
> new file mode 100644
> index 0000000..24bec71
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch
> @@ -0,0 +1,26 @@
> +From 5158da97132db1a43c95f4c0ad65b4ac2629c4da Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Sat, 23 Apr 2016 14:05:04 +0200
> +Subject: [PATCH] Create empty i18n_process_css_test.html file to avoid
> build
> + failure
> +
> +According to
> https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/9JX1N2nf4PU
> +creating an empty i18n_process_css_test.html is a valid workaround for the
> +following build error:
> +
> +"Exception: Failed to open test/data/webui/i18n_process_css_test.html
> while trying to flatten test/data/webui/i18n_process_css_test.html. (No
> such file or directory)"
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + chrome/test/data/webui/i18n_process_css_test.html | 0
> + 1 file changed, 0 insertions(+), 0 deletions(-)
> + create mode 100644 chrome/test/data/webui/i18n_process_css_test.html
> +
> +diff --git a/chrome/test/data/webui/i18n_process_css_test.html
> b/chrome/test/data/webui/i18n_process_css_test.html
> +new file mode 100644
> +index 0000000..e69de29
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0005-Override-root-filesystem-access-restriction.patch
> b/recipes-browser/chromium/chromium/chromium-48/0005-Override-root-filesystem-access-restriction.patch
> new file mode 100644
> index 0000000..ceb6c6c
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0005-Override-root-filesystem-access-restriction.patch
> @@ -0,0 +1,30 @@
> +From ef3aaa58be440c1845e60432a498501088da07fe Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Thu, 28 Apr 2016 09:29:59 +0200
> +Subject: [PATCH] Override root filesystem access restriction
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + sandbox/linux/suid/client/setuid_sandbox_client.cc | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc
> b/sandbox/linux/suid/client/setuid_sandbox_client.cc
> +index 12ef7f9..b59908a 100644
> +--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
> ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
> +@@ -21,8 +21,12 @@
> + namespace {
> +
> + bool IsFileSystemAccessDenied() {
> ++#if 0
> + base::ScopedFD root_dir(HANDLE_EINTR(open("/", O_RDONLY)));
> + return !root_dir.is_valid();
> ++#else
> ++ return true;
> ++#endif
> + }
> +
> + int GetHelperApi(base::Environment* env) {
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0006-Remove-GBM-support-from-wayland.gyp.patch
> b/recipes-browser/chromium/chromium/chromium-48/0006-Remove-GBM-support-from-wayland.gyp.patch
> new file mode 100644
> index 0000000..63cc1ee
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0006-Remove-GBM-support-from-wayland.gyp.patch
> @@ -0,0 +1,66 @@
> +From 77384aa0d93ed6d5f91ada40971f6825e1b9dd69 Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Thu, 28 Apr 2016 22:02:39 +0200
> +Subject: [PATCH] Remove GBM support from wayland.gyp
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + ozone/wayland/wayland.gyp | 20 --------------------
> + 1 file changed, 20 deletions(-)
> +
> +diff --git a/wayland/wayland.gyp b/wayland/wayland.gyp
> +index ff2e210..32f13bc 100644
> +--- a/ozone/wayland/wayland.gyp
> ++++ b/ozone/wayland/wayland.gyp
> +@@ -5,10 +5,6 @@
> +
> + {
> + 'variables': {
> +- 'variables': {
> +- 'enable_drm_support%': 0,
> +- },
> +- 'enable_drm_support%': '<(enable_drm_support)',
> + 'conditions': [
> + ['sysroot!=""', {
> + 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)"
> "<(target_arch)"',
> +@@ -42,17 +38,14 @@
> + 'direct_dependent_settings': {
> + 'cflags': [
> + '<!@(<(pkg-config) --cflags <(wayland_packages))',
> +- '<!@(<(pkg-config) --cflags gbm)',
> + ],
> + },
> + 'link_settings': {
> + 'ldflags': [
> + '<!@(<(pkg-config) --libs-only-L --libs-only-other
> <(wayland_packages))',
> +- '<!@(<(pkg-config) --libs-only-L --libs-only-other gbm)',
> + ],
> + 'libraries': [
> + '<!@(<(pkg-config) --libs-only-l <(wayland_packages))',
> +- '<!@(<(pkg-config) --libs-only-l gbm)',
> + ],
> + },
> + 'dependencies': [
> +@@ -65,19 +58,6 @@
> + '../..',
> + '<(DEPTH)/third_party/khronos',
> + ],
> +- 'conditions': [
> +- ['<(enable_drm_support)==1', {
> +- 'defines': [
> +- 'ENABLE_DRM_SUPPORT',
> +- ],
> +- 'sources': [
> +- 'egl/wayland_pixmap.cc',
> +- 'egl/wayland_pixmap.h',
> +- 'protocol/wayland-drm-protocol.cc',
> +- 'protocol/wayland-drm-protocol.h',
> +- ],
> +- }],
> +- ],
> + 'sources': [
> + 'data_device.cc',
> + 'data_device.h',
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch
> b/recipes-browser/chromium/chromium/chromium-48/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch
> new file mode 100644
> index 0000000..baa8dd2
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch
> @@ -0,0 +1,31 @@
> +From 36a6b35b5eb2874a85b5bc1caf111213c0bee04b Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Fri, 29 Apr 2016 08:52:12 +0200
> +Subject: [PATCH] Workaround for glib-related build error with
> ozone-wayland
> +
> +This fixes the following compilation error:
> +
> +../../third_party/libsecret/secret.h:18:18: fatal error: glib.h: No such
> file or directory
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + chrome/chrome_browser.gypi | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
> +index d964fec..daccacb 100644
> +--- a/chrome/chrome_browser.gypi
> ++++ b/chrome/chrome_browser.gypi
> +@@ -3543,6 +3543,9 @@
> + ],
> + }],
> + ['OS=="linux" and chromeos!=1', {
> ++ 'dependencies': [
> ++ '../build/linux/system.gyp:glib',
> ++ ],
> + 'sources': [ '<@(chrome_browser_libsecret_sources)' ],
> + 'defines': [
> + 'USE_LIBSECRET',
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0008-Fix-GCC-uninitialized-warning.patch
> b/recipes-browser/chromium/chromium/chromium-48/0008-Fix-GCC-uninitialized-warning.patch
> new file mode 100644
> index 0000000..3bf6d96
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0008-Fix-GCC-uninitialized-warning.patch
> @@ -0,0 +1,26 @@
> +From 12d7fb643188ea5033aaf70ffe64b4c58eefc5eb Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Fri, 29 Apr 2016 14:02:44 +0200
> +Subject: [PATCH] Fix GCC uninitialized warning
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + third_party/ots/src/name.cc | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/third_party/ots/src/name.cc b/third_party/ots/src/name.cc
> +index a0dd1ea..070ddae 100644
> +--- a/third_party/ots/src/name.cc
> ++++ b/third_party/ots/src/name.cc
> +@@ -79,7 +79,7 @@ bool ots_name_parse(Font *font, const uint8_t* data,
> size_t length) {
> + const char* string_base = reinterpret_cast<const char*>(data) +
> + string_offset;
> +
> +- NameRecord prev_record;
> ++ NameRecord prev_record(0, 0, 0, 0);
> + bool sort_required = false;
> +
> + // Read all the names, discarding any with invalid IDs,
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-48/0009-Fix-build-errors-with-GCC-in-Debug-mode.patch
> b/recipes-browser/chromium/chromium/chromium-48/0009-Fix-build-errors-with-GCC-in-Debug-mode.patch
> new file mode 100644
> index 0000000..f5f7889
> --- /dev/null
> +++
> b/recipes-browser/chromium/chromium/chromium-48/0009-Fix-build-errors-with-GCC-in-Debug-mode.patch
> @@ -0,0 +1,46 @@
> +From 2d7143090fdfd82950be352078daa5019279d81f Mon Sep 17 00:00:00 2001
> +From: Carlos Rafael Giani <dv at pseudoterminal.org>
> +Date: Fri, 29 Apr 2016 17:14:15 +0200
> +Subject: [PATCH] Fix build errors with GCC in Debug mode
> +
> +Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
> +---
> + third_party/WebKit/Source/wtf/dtoa/utils.h | 7
> +++++++
> + .../cacheinvalidation/src/google/cacheinvalidation/include/types.h | 2 +-
> + 2 files changed, 8 insertions(+), 1 deletion(-)
> +
> +diff --git a/third_party/WebKit/Source/wtf/dtoa/utils.h
> b/third_party/WebKit/Source/wtf/dtoa/utils.h
> +index 0a61c01..7738e9a 100644
> +--- a/third_party/WebKit/Source/wtf/dtoa/utils.h
> ++++ b/third_party/WebKit/Source/wtf/dtoa/utils.h
> +@@ -165,7 +165,14 @@ namespace double_conversion {
> +
> + // Access individual vector elements - checks bounds in debug
> mode.
> + T& operator[](int index) const {
> ++#if !defined(NDEBUG)
> ++#pragma GCC diagnostic push
> ++#pragma GCC diagnostic ignored "-Wstrict-overflow"
> ++#endif // !defined(NDEBUG)
> + ASSERT(0 <= index && index < length_);
> ++#if !defined(NDEBUG)
> ++#pragma GCC diagnostic pop
> ++#endif // !defined(NDEBUG)
> + return start_[index];
> + }
> +
> +diff --git
> a/third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
> b/third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
> +index 4e3be27..835e956 100644
> +---
> a/third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
> ++++
> b/third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
> +@@ -172,7 +172,7 @@ class ErrorInfo {
> + */
> + class ObjectId {
> + public:
> +- ObjectId() : is_initialized_(false) {}
> ++ ObjectId() : is_initialized_(false), source_(0) {}
> +
> + /* Creates an object id for the given source and name (the name is
> copied). */
> + ObjectId(int source, const string& name)
> +--
> +2.5.0
> +
> diff --git
> a/recipes-browser/chromium/chromium/chromium-40/add_missing_stat_h_include.patch
> b/recipes-browser/chromium/chromium/chromium-48/add_missing_stat_h_include.patch
> similarity index 90%
> rename from
> recipes-browser/chromium/chromium/chromium-40/add_missing_stat_h_include.patch
> rename to
> recipes-browser/chromium/chromium/chromium-48/add_missing_stat_h_include.patch
> index 90e7827..4620db2 100644
> ---
> a/recipes-browser/chromium/chromium/chromium-40/add_missing_stat_h_include.patch
> +++
> b/recipes-browser/chromium/chromium/chromium-48/add_missing_stat_h_include.patch
> @@ -27,8 +27,8 @@ Tested with ARCH armv7.
> Signed-off-by: Max Krummenacher <max.oss.09 at gmail.com>
> Upstream-Status: Pending
>
> ----
> chromium-40.0.2214.91/components/storage_monitor/storage_monitor_linux.cc~
> 2015-01-21 21:28:16.000000000 +0100
> -+++
> chromium-40.0.2214.91/components/storage_monitor/storage_monitor_linux.cc
> 2015-10-27 13:21:08.405655894 +0100
> +--- a/components/storage_monitor/storage_monitor_linux.cc~ 2015-01-21
> 21:28:16.000000000 +0100
> ++++ b/components/storage_monitor/storage_monitor_linux.cc 2015-10-27
> 13:21:08.405655894 +0100
> @@ -8,6 +8,7 @@
>
> #include <mntent.h>
> diff --git a/recipes-browser/chromium/chromium_40.0.2214.91.bb
> b/recipes-browser/chromium/chromium_40.0.2214.91.bb
> deleted file mode 100644
> index 3966548..0000000
> --- a/recipes-browser/chromium/chromium_40.0.2214.91.bb
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -include chromium-browser.inc
> -
> -SRC_URI += "\
> - file://unistd-2.patch \
> - file://chromium-40/fix-build-error-with-GCC-in-Debug-mode.patch \
> - file://chromium-40/add_missing_stat_h_include.patch \
> -
> file://chromium-40/0001-bignum.cc-disable-warning-from-gcc-5.patch \
> -
> file://chromium-40/0002-image_util.cc-disable-warning-from-gcc-5.patch \
> - file://chromium-40/0003-disable-uninitialized-warning.patch \
> -
> file://chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch \
> - ${@bb.utils.contains('PACKAGECONFIG', 'ignore-lost-context',
> 'file://chromium-40/0001-Remove-accelerated-Canvas-support-from-blacklist.patch',
> '', d)} \
> - ${@bb.utils.contains('PACKAGECONFIG', 'impl-side-painting',
> 'file://chromium-40/0002-Add-Linux-to-impl-side-painting-whitelist.patch',
> '', d)} \
> - ${@bb.utils.contains('PACKAGECONFIG',
> 'disable-api-keys-info-bar',
> 'file://chromium-40/0003-Disable-API-keys-info-bar.patch', '', d)} \
> -"
> -
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5"
> -SRC_URI[md5sum] = "1f5093bd7e435fdebad070e74bfb3438"
> -SRC_URI[sha256sum] =
> "f72fda9ff1ea256ab911610ee532eadf8303137d431f2481d01d3d60e5e64149"
> -
> -OZONE_WAYLAND_GIT_BRANCH = "Milestone-ThanksGiving"
> -OZONE_WAYLAND_GIT_SRCREV = "5d7baa9bc3b8c88e9b7e476e3d6bc8cd44a887fe"
> -
> -OZONE_WAYLAND_EXTRA_PATCHES = " \
> - file://chromium-40/0005-Remove-X-libraries-from-GYP-files.patch \
> - file://chromium-40/0010-systemd-218.patch \
> -"
> -# using 00*.patch to skip the WebRTC patches in ozone-wayland
> ThanksGiving milestone.
> -# The WebRTC patches remove X11 libraries from the linker flags, which is
> -# already done by another patch (see above). Furthermore, to be able to
> use
> -# these patches, it is necessary to update the git repository in
> third_party/webrtc,
> -# which would further complicate this recipe.
> -OZONE_WAYLAND_PATCH_FILE_GLOB = "00*.patch"
> -
> -# Component build is broken in ozone-wayland for Chromium 40,
> -# and is not planned to work again before version 41
> -python() {
> - if (d.getVar('CHROMIUM_ENABLE_WAYLAND', True) == '1'):
> - if bb.utils.contains('PACKAGECONFIG', 'component-build', True,
> False, d):
> - bb.fatal("Chromium 40 Wayland version cannot be built in
> component-mode")
> -}
> -
> -CHROMIUM_X11_DEPENDS = "xextproto gtk+ libxi libxss"
> -CHROMIUM_X11_GYP_DEFINES = ""
> -CHROMIUM_WAYLAND_DEPENDS = "wayland libxkbcommon"
> -CHROMIUM_WAYLAND_GYP_DEFINES = "use_ash=1 use_aura=1 chromeos=0
> use_ozone=1"
> diff --git a/recipes-browser/chromium/chromium_48.0.2548.0.bb
> b/recipes-browser/chromium/chromium_48.0.2548.0.bb
> new file mode 100644
> index 0000000..1a574a4
> --- /dev/null
> +++ b/recipes-browser/chromium/chromium_48.0.2548.0.bb
> @@ -0,0 +1,42 @@
> +include chromium-browser.inc
> +
> +SRC_URI += "\
> + file://chromium-48/add_missing_stat_h_include.patch \
> +
> file://chromium-48/0001-bignum.cc-disable-warning-from-gcc-5.patch \
> +
> file://chromium-48/0002-image_util.cc-disable-warning-from-gcc-5.patch \
> +
> file://chromium-48/0003-Remove-hard-coded-values-for-CC-and-CXX.patch \
> +
> file://chromium-48/0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch
> \
> +
> file://chromium-48/0005-Override-root-filesystem-access-restriction.patch \
> + file://chromium-48/0008-Fix-GCC-uninitialized-warning.patch \
> +
> file://chromium-48/0009-Fix-build-errors-with-GCC-in-Debug-mode.patch \
> + ${@bb.utils.contains('PACKAGECONFIG', 'ignore-lost-context',
> 'file://chromium-48/0001-Remove-accelerated-Canvas-support-from-blacklist.patch',
> '', d)} \
> + ${@bb.utils.contains('PACKAGECONFIG',
> 'disable-api-keys-info-bar',
> 'file://chromium-48/0002-Disable-API-keys-info-bar.patch', '', d)} \
> +"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
> +SRC_URI[md5sum] = "0534981cc21efcd11e64b67b85854420"
> +SRC_URI[sha256sum] =
> "4ca4e2adb340b3fb4d502266ad7d6bda45fa3519906dbf63cce11a63f680dbc8"
> +
> +EXTRA_OEGYP += " \
> + -Dv8_use_external_startup_data=0 \
> +"
> +
> +OZONE_WAYLAND_GIT_BRANCH = "Milestone-SouthSister"
> +OZONE_WAYLAND_GIT_SRCREV = "c605505044af3345a276abbd7c29fd53db1dea40"
> +
> +OZONE_WAYLAND_EXTRA_PATCHES = " \
> + file://chromium-48/0006-Remove-GBM-support-from-wayland.gyp.patch \
> +
> file://chromium-48/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch
> \
> +"
> +
> +# Component build is unsupported in ozone-wayland for Chromium 48
> +python() {
> + if (d.getVar('CHROMIUM_ENABLE_WAYLAND', True) == '1'):
> + if bb.utils.contains('PACKAGECONFIG', 'component-build', True,
> False, d):
> + bb.fatal("Chromium 48 Wayland version cannot be built in
> component-mode")
> +}
> +
> +CHROMIUM_X11_DEPENDS = "xextproto gtk+ libxi libxss"
> +CHROMIUM_X11_GYP_DEFINES = ""
> +CHROMIUM_WAYLAND_DEPENDS = "wayland libxkbcommon"
> +CHROMIUM_WAYLAND_GYP_DEFINES = "use_ash=1 use_aura=1 chromeos=0
> use_ozone=1 use_xkbcommon=1"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
More information about the Openembedded-devel
mailing list