From 7d1d3c02060be2315503aed62e98dd6d51fd1b44 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 18 Nov 2020 15:52:37 -0500 Subject: [PATCH] Linux: Fix ATK assertion error when generating ARM build config. --- patch/patch.cfg | 5 +++++ patch/patches/linux_atk_1123214.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 patch/patches/linux_atk_1123214.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index 6dee29049..6fa9cf0b6 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -524,5 +524,10 @@ patches = [ # Windows/Linux: Fix scrolling in popup lists with high-dpi. # https://crrev.com/97514ca869 'name': 'webkit_widget_base_2444320', + }, + { + # Linux: Fix ATK assertion error when generating ARM build config. + # https://bugs.chromium.org/p/chromium/issues/detail?id=1123214 + 'name': 'linux_atk_1123214', } ] diff --git a/patch/patches/linux_atk_1123214.patch b/patch/patches/linux_atk_1123214.patch new file mode 100644 index 000000000..dff7e4e38 --- /dev/null +++ b/patch/patches/linux_atk_1123214.patch @@ -0,0 +1,13 @@ +diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn +index aad2efa60d6c..fe9f30b82c22 100644 +--- build/config/linux/atk/BUILD.gn ++++ build/config/linux/atk/BUILD.gn +@@ -10,7 +10,7 @@ import("//build/config/ui.gni") + assert(!is_chromeos) + + # These packages should _only_ be expected when building for a target. +-assert(current_toolchain == default_toolchain) ++# assert(current_toolchain == default_toolchain) + + if (use_atk) { + assert(use_glib, "use_atk=true requires that use_glib=true")