Skip to content

Commit 772a887

Browse files
committed
chromium: update to 87.0.4280.88
Stable release announcements since our latest update: https://chromereleases.googleblog.com/2020/12/stable-channel-update-for-desktop.html Test-built with: * chromium-x11 * dunfell, clang, MACHINE="intel-core2-32" * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="raspberrypi3" * gatesgarth, MACHINE="raspberrypi3" * chromium-ozone-wayland: * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="qemuarm64" * gatesgarth, clang, MACHINE="raspberrypi3" * dunfell, clang, MACHINE="m3ulcb" License changes --------------- Added licenses: * third_party/fusejs/LICENSE - Tab Search: Add Fuse.js to third_party/ - https://chromium-review.googlesource.com/c/chromium/src/+/2375728 * third_party/hyphenation-patterns/LICENSE - Add third_party/hyphenation-patterns - https://chromium-review.googlesource.com/c/chromium/src/+/2254498 * third_party/shaka-player/LICENSE - Add shaka player to //third_party - https://chromium-review.googlesource.com/c/chromium/src/+/2359572 Removed licenses: * third_party/openvr/src/LICENSE - Remove OpenVR runtime and references - https://chromium-review.googlesource.com/c/chromium/src/+/2415308 Android-only: Added licenses: * third_party/android_ndk/NOTICE - Upgrade to NDK r20 - https://chromium-review.googlesource.com/c/android_ndk/+/1754382 Removed licenses: * third_party/android_deps/libs/androidx_legacy_legacy_support_v13/LICENSE - Reland: "Remove unused androidx-legacy libraries" - https://chromium-review.googlesource.com/c/chromium/src/+/2405998 * third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE third_party/android_deps/libs/com_android_support_design/LICENSE third_party/android_deps/libs/com_android_support_gridlayout_v7/LICENSE third_party/android_deps/libs/com_android_support_leanback_v17/LICENSE third_party/android_deps/libs/com_android_support_mediarouter_v7/LICENSE third_party/android_deps/libs/com_android_support_palette_v7/LICENSE third_party/android_deps/libs/com_android_support_preference_leanback_v17/LICENSE third_party/android_deps/libs/com_android_support_preference_v14/LICENSE third_party/android_deps/libs/com_android_support_preference_v7/LICENSE third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE third_party/android_deps/libs/com_android_support_support_v13/LICENSE third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE third_party/android_deps/libs/com_android_support_transition/LICENSE - Remove unused com_android_support targets in //third_party/android_deps - https://chromium-review.googlesource.com/c/chromium/src/+/2425010 Fixes #429
1 parent 1205a4e commit 772a887

16 files changed

+214
-598
lines changed

recipes-browser/chromium/chromium-gn.inc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ SRC_URI += " \
1616
file://add_internal_define_armv7ve.patch \
1717
file://delete_not_yet_released_clang_warnings.patch \
1818
file://chromium-Move-CharAllocator-definition-to-a-header-f.patch \
19+
file://remove-enable-dse-memoryssa-command-line-flag.patch \
1920
file://0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch \
2021
file://0001-Revert-ui-gfx-linux-Remove-2-unnecessary-preprocesso.patch \
21-
file://0001-Turn-TouchMove-to-async-after-the-first-GestureScrol.patch \
22-
file://0001-Remove-dead-reloc-in-nonalloc-LD-flags.patch \
2322
file://0001-add-missing-cstring-include.patch \
23+
file://0001-drop-dep-on-ui-ozone-for-building-without-ozone.patch \
24+
file://0001-Fix-local-build.patch \
25+
file://0001-IWYU-ui-CursorFactory-is-required-without-Ozone.patch \
2426
"
2527

2628
SRC_URI_append_libc-musl = "\
@@ -222,6 +224,12 @@ GN_ARGS += "is_cfi=false"
222224
# See https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/ECWC57W7E0k/9Kc5UAmyDAAJ
223225
GN_ARGS += "fieldtrial_testing_like_official_build=true"
224226

227+
# Disable PGO optimization as generated profdata requires the same version of
228+
# clang that upstream uses. Otherwise, clang-llvm produces the following error:
229+
# Unsupported instrumentation profile format version.
230+
# See https://crrev.com/c/2424669
231+
GN_ARGS += "chrome_pgo_phase=0"
232+
225233
# API keys for accessing Google services. By default, we use an invalid key
226234
# only to prevent the "you are missing an API key" infobar from being shown on
227235
# startup.

recipes-browser/chromium/chromium-ozone-wayland_86.0.4240.198.bb renamed to recipes-browser/chromium/chromium-ozone-wayland_87.0.4280.88.bb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@ GN_ARGS += "\
1818
ozone_platform_wayland=true \
1919
ozone_platform_x11=false \
2020
system_wayland_scanner_path="${STAGING_BINDIR_NATIVE}/wayland-scanner" \
21+
use_system_wayland_scanner=true \
2122
use_xkbcommon=true \
2223
use_system_libwayland=true \
2324
use_system_minigbm=true \
2425
use_system_libdrm=true \
2526
use_gtk=false \
2627
"
2728

29+
# Since M87, Chromium builds Ozone by default, but continues to use X11.
30+
# However, the goal of two recipes - Ozone/Wayland and non-Ozone/X11 is
31+
# to provide either Wayland or X11 and avoid pulling dependencies of each
32+
# on environments where Wayland or X11 is not actually required.
33+
# See https://crrev.com/c/2382834
34+
GN_ARGS += "use_x11=false"
35+
2836
# The chromium binary must always be started with those arguments.
2937
CHROMIUM_EXTRA_ARGS_append = " --ozone-platform=wayland"

recipes-browser/chromium/chromium-x11_86.0.4240.198.bb renamed to recipes-browser/chromium/chromium-x11_87.0.4280.88.bb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ DEPENDS += "\
1616
libxtst \
1717
"
1818

19+
# Since M87, Chromium builds Ozone by default, but continues to use X11.
20+
# However, the goal of two recipes - Ozone/Wayland and non-Ozone/X11 is
21+
# to provide either Wayland or X11 and avoid pulling dependencies of each
22+
# on environments where Wayland or X11 is not actually required.
23+
# See https://crrev.com/c/2382834
24+
GN_ARGS += "use_ozone=false"
25+
1926
# Compatibility glue while we have both chromium-x11 and
2027
# chromium-ozone-wayland recipes, and the former used to be called just
2128
# "chromium".

recipes-browser/chromium/chromium.inc

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[md5sum] = "8f32d5246d70e96d481cc531ce839159"
8-
SRC_URI[sha256sum] = "a0ab825e527becab4ab3e11ef889e842436fe11a4fb7874419d1970e680c7a44"
7+
SRC_URI[md5sum] = "017cef5555c7a957091ce12bdd98c821"
8+
SRC_URI[sha256sum] = "3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0"
99

1010
S = "${WORKDIR}/chromium-${PV}"
1111

@@ -111,7 +111,6 @@ LIC_FILES_CHKSUM = "\
111111
file://${S}/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
112112
file://${S}/third_party/android_deps/libs/androidx_legacy_legacy_support_core_ui/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
113113
file://${S}/third_party/android_deps/libs/androidx_legacy_legacy_support_core_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
114-
file://${S}/third_party/android_deps/libs/androidx_legacy_legacy_support_v13/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
115114
file://${S}/third_party/android_deps/libs/androidx_legacy_legacy_support_v4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
116115
file://${S}/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
117116
file://${S}/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -143,42 +142,27 @@ LIC_FILES_CHKSUM = "\
143142
file://${S}/third_party/android_deps/libs/androidx_viewpager_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
144143
file://${S}/third_party/android_deps/libs/androidx_webkit_webkit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
145144
file://${S}/third_party/android_deps/libs/androidx_window_window/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
146-
file://${S}/third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
147-
file://${S}/third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
148145
file://${S}/third_party/android_deps/libs/com_android_support_asynclayoutinflater/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
149-
file://${S}/third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
150146
file://${S}/third_party/android_deps/libs/com_android_support_collections/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
151147
file://${S}/third_party/android_deps/libs/com_android_support_coordinatorlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
152148
file://${S}/third_party/android_deps/libs/com_android_support_cursoradapter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
153149
file://${S}/third_party/android_deps/libs/com_android_support_customview/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
154-
file://${S}/third_party/android_deps/libs/com_android_support_design/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
155150
file://${S}/third_party/android_deps/libs/com_android_support_documentfile/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
156151
file://${S}/third_party/android_deps/libs/com_android_support_drawerlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
157-
file://${S}/third_party/android_deps/libs/com_android_support_gridlayout_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
158152
file://${S}/third_party/android_deps/libs/com_android_support_interpolator/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
159-
file://${S}/third_party/android_deps/libs/com_android_support_leanback_v17/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
160153
file://${S}/third_party/android_deps/libs/com_android_support_loader/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
161154
file://${S}/third_party/android_deps/libs/com_android_support_localbroadcastmanager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
162-
file://${S}/third_party/android_deps/libs/com_android_support_mediarouter_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
163155
file://${S}/third_party/android_deps/libs/com_android_support_multidex/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
164-
file://${S}/third_party/android_deps/libs/com_android_support_palette_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165-
file://${S}/third_party/android_deps/libs/com_android_support_preference_leanback_v17/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166-
file://${S}/third_party/android_deps/libs/com_android_support_preference_v14/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
167-
file://${S}/third_party/android_deps/libs/com_android_support_preference_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
168156
file://${S}/third_party/android_deps/libs/com_android_support_print/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
169-
file://${S}/third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
170157
file://${S}/third_party/android_deps/libs/com_android_support_slidingpanelayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
171158
file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
172159
file://${S}/third_party/android_deps/libs/com_android_support_support_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
173160
file://${S}/third_party/android_deps/libs/com_android_support_support_core_ui/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
174161
file://${S}/third_party/android_deps/libs/com_android_support_support_core_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
175162
file://${S}/third_party/android_deps/libs/com_android_support_support_fragment/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
176163
file://${S}/third_party/android_deps/libs/com_android_support_support_media_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
177-
file://${S}/third_party/android_deps/libs/com_android_support_support_v13/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
178164
file://${S}/third_party/android_deps/libs/com_android_support_support_v4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
179-
file://${S}/third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
180165
file://${S}/third_party/android_deps/libs/com_android_support_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
181-
file://${S}/third_party/android_deps/libs/com_android_support_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
182166
file://${S}/third_party/android_deps/libs/com_android_support_versionedparcelable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
183167
file://${S}/third_party/android_deps/libs/com_android_support_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
184168
file://${S}/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f \
@@ -212,6 +196,7 @@ LIC_FILES_CHKSUM = "\
212196
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
213197
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
214198
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
199+
file://${S}/third_party/android_ndk/NOTICE;md5=5552da59999006962cb94f01f7f42081 \
215200
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
216201
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
217202
file://${S}/third_party/android_sdk/LICENSE;md5=a9559ed17808a8b10eec6672f993ce75 \
@@ -248,6 +233,7 @@ LIC_FILES_CHKSUM = "\
248233
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
249234
file://${S}/third_party/fontconfig/src/COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
250235
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
236+
file://${S}/third_party/fusejs/LICENSE;md5=f61de6d0d3d200550e44d63cc2a4fb67 \
251237
file://${S}/third_party/gif_player/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
252238
file://${S}/third_party/glslang/LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73 \
253239
file://${S}/third_party/google-closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
@@ -260,6 +246,7 @@ LIC_FILES_CHKSUM = "\
260246
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=50b9d1f02b2ee0d8a568ccf4d35216e2 \
261247
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=8f787620b7d3866d9552fd1924c07572 \
262248
file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
249+
file://${S}/third_party/hyphenation-patterns/LICENSE;md5=53b217e6f2560833cbb279119065ae61 \
263250
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
264251
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
265252
file://${S}/third_party/icu/LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0 \
@@ -313,7 +300,6 @@ LIC_FILES_CHKSUM = "\
313300
file://${S}/third_party/opencv/src/LICENSE;md5=19598330421859a6dd353a4318091ac7 \
314301
file://${S}/third_party/openh264/src/LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf \
315302
file://${S}/third_party/openscreen/src/LICENSE;md5=d5fead7a94377fb7b73964d9144c6cbb \
316-
file://${S}/third_party/openvr/src/LICENSE;md5=3f0ba432004f9cf11d8186503a8bd3d7 \
317303
file://${S}/third_party/opus/src/COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3 \
318304
file://${S}/third_party/ots/LICENSE;md5=e06eff2aa65b917034a81599bea73dc4 \
319305
file://${S}/third_party/pdfium/LICENSE;md5=efe815679251504905d0f2c88a77c886 \
@@ -332,6 +318,7 @@ LIC_FILES_CHKSUM = "\
332318
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
333319
file://${S}/third_party/schema_org/LICENSE;md5=13a870bd7f606a919042749a5f098ac2 \
334320
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
321+
file://${S}/third_party/shaka-player/LICENSE;md5=92b1fa01a6465982c12714cf43e6ecd2 \
335322
file://${S}/third_party/shell-encryption/src/LICENSE;md5=c96a2157133614bf8a135bd27cd230d6 \
336323
file://${S}/third_party/simplejson/LICENSE.txt;md5=8a9f8dcfcd28c34daa443e5b1d29813b \
337324
file://${S}/third_party/skia/LICENSE;md5=822f02cc7736281816581cd064afbb1c \
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Upstream-Status: Backport
2+
3+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4+
---
5+
From 436fdba1d682a6fc7341897f4f7aa785ff831f93 Mon Sep 17 00:00:00 2001
6+
From: Jordan Bayles <jophba@chromium.org>
7+
Date: Wed, 2 Dec 2020 10:45:26 -0800
8+
Subject: [PATCH] Fix local build
9+
10+
This patch fixes a local build issue due to uint8_t not being defined.
11+
12+
TBR=miu@chromium.org
13+
14+
Change-Id: I8b4ab03b82c95a68fbbf173a6dab09d40f8e1d08
15+
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2569888
16+
Reviewed-by: Jordan Bayles <jophba@chromium.org>
17+
Commit-Queue: Jordan Bayles <jophba@chromium.org>
18+
---
19+
third_party/openscreen/src/util/crypto/random_bytes.h | 1 +
20+
1 file changed, 1 insertion(+)
21+
22+
diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
23+
index 3cb2fa8e..362d58d4 100644
24+
--- a/third_party/openscreen/src/util/crypto/random_bytes.h
25+
+++ b/third_party/openscreen/src/util/crypto/random_bytes.h
26+
@@ -6,6 +6,7 @@
27+
#define UTIL_CRYPTO_RANDOM_BYTES_H_
28+
29+
#include <array>
30+
+#include <cstdint>
31+
32+
namespace openscreen {
33+
34+
--
35+
2.25.1
36+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Upstream-Status: Backport
2+
3+
Backported from https://crrev.com/c/2576237
4+
5+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
6+
---
7+
From 3a19dbc40ff05dc37679870109834db95db7a9b4 Mon Sep 17 00:00:00 2001
8+
From: Stephan Hartmann <stha09@googlemail.com>
9+
Date: Sun, 6 Dec 2020 14:46:57 +0000
10+
Subject: [PATCH] IWYU: ui::CursorFactory is required without Ozone
11+
12+
Bug: None
13+
Change-Id: Ieebcc426ec76f3f85a52c2dd3dcee17b07d1f02b
14+
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576237
15+
Reviewed-by: Peter Kasting <pkasting@chromium.org>
16+
Commit-Queue: Peter Kasting <pkasting@chromium.org>
17+
Cr-Commit-Position: refs/heads/master@{#834075}
18+
---
19+
.../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
20+
1 file changed, 1 insertion(+), 4 deletions(-)
21+
22+
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
23+
index 5a97d615a093..ccedd2a2af63 100644
24+
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
25+
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
26+
@@ -7,6 +7,7 @@
27+
#include "chrome/browser/themes/theme_service_aura_linux.h"
28+
#include "chrome/browser/ui/browser_list.h"
29+
#include "chrome/browser/ui/views/theme_profile_key.h"
30+
+#include "ui/base/cursor/cursor_factory.h"
31+
#include "ui/display/screen.h"
32+
#include "ui/views/linux_ui/linux_ui.h"
33+
34+
@@ -15,10 +16,6 @@
35+
#include "ui/gtk/gtk_ui_delegate.h"
36+
#endif
37+
38+
-#if defined(USE_OZONE)
39+
-#include "ui/base/cursor/cursor_factory.h"
40+
-#endif
41+
-
42+
#if defined(USE_X11)
43+
#include "ui/gfx/x/connection.h" // nogncheck
44+
#if BUILDFLAG(USE_GTK)
45+
--
46+
2.25.1
47+

recipes-browser/chromium/files/0001-Remove-dead-reloc-in-nonalloc-LD-flags.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

recipes-browser/chromium/files/0001-Revert-ui-gfx-linux-Remove-2-unnecessary-preprocesso.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Upstream-Status: Pending
1+
Upstream-Status: Inappropriate
22

33
System libdrm doesn't define DRM_FORMAT_INVALID and DRM_FORMAT_010.
44

0 commit comments

Comments
 (0)