commit: c82202486e56dbe7be55fa708154fa1df71fb97b Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sat Apr 17 12:36:05 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sat Apr 17 12:38:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8220248
www-client/chromium: dev channel bump to 91.0.4472.10 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 +-- ....4469.4.ebuild => chromium-91.0.4472.10.ebuild} | 18 +++++------ .../files/chromium-91-ThemeService-crash.patch | 36 ++++++++++++++++++++++ .../chromium/files/chromium-91-system-icu.patch | 29 +++++++++++++++++ 4 files changed, 74 insertions(+), 13 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 3af48dd8294..f9bb0669943 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -3,6 +3,6 @@ DIST chromium-89.0.4389.114.tar.xz 890898912 BLAKE2B b9590f83eb54fc1b524a7893f8c DIST chromium-89.0.4389.128.tar.xz 890850492 BLAKE2B 24a6437024994c5fbefc059b966e1bd6dd3d11ad827ba2dc0e010e5503a7a93579d0cb23acc0c00f687c7f21372bb04eae875e555abb933a4a9afe813b8b727c SHA512 37f694dea7a1f398082c5c0f02579c9e2c855a424cf4e09ebc94cac9313836e604dcc52bd1fbc105ac3d5e54bb056da3e62daec1e3bbd11c00f466125ef4bdc1 DIST chromium-90-patchset-7.tar.xz 3892 BLAKE2B 3ba169baaaf74b548749be3f845f505256cc9573f798e10929b5d1f0f534d739e657e3fa134c78ec3f7987a3b89adfc4bee0d1a6585ad8fe4bdc3ffd1181042c SHA512 5e1aa834ee5668ee40fc3af5cda7325da710dd1a0dea7ce535e89e36fd7d321db63d520a9b6ce6372ed941473dff18d1276316567af810c18e1478a04d3f23f8 DIST chromium-90.0.4430.72.tar.xz 917364932 BLAKE2B 12813a6cd32c5ff2532d4d97d99e955d4ec7868c702e437039fd7daa806b8f9d77b96a2dc713438efcb5c1b14069ca3489b666e2c33daa3b0ac701c3038662b5 SHA512 b07943ac1535cce0d02046b6e79eb01809bfae95ad6eea3bc7d209ff41d54278ca6575462ea372f3014b434e4f1dc8e529aa752a77ec519659abd089e21506e3 -DIST chromium-91-patchset-4.tar.xz 3188 BLAKE2B 34d64f4124cb5c020d7d20c883c3409f710b96d5412f8881936e86d78ed034c1d70bd16f9324c5af21f735c3c5f98b4b4cd28cbd7f86f9513df2a5f1ff404772 SHA512 79c1640a7248d628c31fdbf3df296aa888e80f3c90cc6a74be56ac1389d9748b7cce88641e626cd4a5ae298e82fb325a8604fda68378706f0f26a2570e8983a2 -DIST chromium-91.0.4469.4.tar.xz 949712784 BLAKE2B 99453196fb9f2336afffb03affcf7441a1ee5f8c9ce50c76888783b8520f2490299e5fc3448c7f61c270c175e48e55a1f947f8cfdf0053a02513676d9ed8daeb SHA512 413452da449198713e6d10f05b937f95a6c0ffb11b2408dc9ced1048af6f7a406af07f8112fe39f73482723802ff25e51ce0085c598d03dba207a5658385871d +DIST chromium-91-patchset-5.tar.xz 3648 BLAKE2B 6c8636f63dc857886d09c8ed69b4c61adc627d2280decdf03b548be8ff2cb522ef0def7a240d1c3c9ee71920304a43af571e2146e2828b89c3b6f87373b8c4a1 SHA512 1554feec958291ad3140e2685683befe4b6e0b0ab6a8694c0e02d5b4bf4b7fcad410f17e72099653456fd95ed24a732dd28f2dcfaf146eb3bf68052e2342a481 +DIST chromium-91.0.4472.10.tar.xz 949094512 BLAKE2B 902f09e8f3f45598343524ab6dd6f91267c387d882c83c085fa8021c6db65c9093ac6aa9ad73ce64386a1642d3dbe9aa55cc024cdbcdad14032c89141426c962 SHA512 03cb2671941d3a1d38a424336b7e72ca28db249acc6df4d72d53cf59698cca140e935fa0c1dc07bf1f48e9a240690f7e10e57cff09ce5b86225bc229a27b80fa DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-91.0.4469.4.ebuild b/www-client/chromium/chromium-91.0.4472.10.ebuild similarity index 98% rename from www-client/chromium/chromium-91.0.4469.4.ebuild rename to www-client/chromium/chromium-91.0.4472.10.ebuild index e9fb9b7d3ab..a4a4720d578 100644 --- a/www-client/chromium/chromium-91.0.4469.4.ebuild +++ b/www-client/chromium/chromium-91.0.4472.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_8 ) +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he @@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/"; -PATCHSET="4" +PATCHSET="5" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip @@ -40,8 +40,8 @@ COMMON_X_DEPEND=" x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= - x11-libs/libXScrnSaver:= x11-libs/libxcb:= + x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) " @@ -109,7 +109,6 @@ BDEPEND=" >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl - dev-lang/python:2.7[xml] >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 @@ -229,6 +228,8 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" "${FILESDIR}/chromium-89-EnumTable-crash.patch" + "${FILESDIR}/chromium-91-ThemeService-crash.patch" + "${FILESDIR}/chromium-91-system-icu.patch" "${FILESDIR}/chromium-shim_headers.patch" ) @@ -237,12 +238,6 @@ src_prepare() { mkdir -p third_party/node/linux/node-linux-x64/bin || die ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die - # adjust python interpreter versions - sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die - sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die - sed -i -e "s|python|python2\.7|g" \ - third_party/dom_distiller_js/protoc_plugins/json_values_converter.py || die - local keeplibs=( base/third_party/cityhash base/third_party/double_conversion @@ -330,6 +325,7 @@ src_prepare() { third_party/flatbuffers third_party/freetype third_party/fusejs + third_party/highway third_party/libgifcodec third_party/liburlpattern third_party/libzip @@ -356,6 +352,7 @@ src_prepare() { third_party/libavif third_party/libgav1 third_party/libjingle + third_party/libjxl third_party/libphonenumber third_party/libsecret third_party/libsrtp @@ -413,7 +410,6 @@ src_prepare() { third_party/qcms third_party/rnnoise third_party/s2cellid - third_party/schema_org third_party/securemessage third_party/shell-encryption third_party/simplejson diff --git a/www-client/chromium/files/chromium-91-ThemeService-crash.patch b/www-client/chromium/files/chromium-91-ThemeService-crash.patch new file mode 100644 index 00000000000..455aef33e78 --- /dev/null +++ b/www-client/chromium/files/chromium-91-ThemeService-crash.patch @@ -0,0 +1,36 @@ +From 265192616d494ed586df9123ceb63389a7c48916 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Tue, 13 Apr 2021 06:20:25 +0000 +Subject: [PATCH] fix crash in theme_service + +--- + chrome/browser/themes/theme_service.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h +index 592d40a..337dfac 100644 +--- a/chrome/browser/themes/theme_service.h ++++ b/chrome/browser/themes/theme_service.h +@@ -299,6 +299,10 @@ class ThemeService : public KeyedService, + // The number of infobars currently displayed. + int number_of_reinstallers_ = 0; + ++ // Declared before |theme_syncable_service_|, because ThemeSyncableService ++ // removes itself from the |observers_| list on destruction. ++ base::ObserverList<ThemeServiceObserver> observers_; ++ + std::unique_ptr<ThemeSyncableService> theme_syncable_service_; + + #if BUILDFLAG(ENABLE_EXTENSIONS) +@@ -320,8 +324,6 @@ class ThemeService : public KeyedService, + ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> + native_theme_observer_{this}; + +- base::ObserverList<ThemeServiceObserver> observers_; +- + base::WeakPtrFactory<ThemeService> weak_ptr_factory_{this}; + + DISALLOW_COPY_AND_ASSIGN(ThemeService); +-- +2.26.3 + diff --git a/www-client/chromium/files/chromium-91-system-icu.patch b/www-client/chromium/files/chromium-91-system-icu.patch new file mode 100644 index 00000000000..797ee33b374 --- /dev/null +++ b/www-client/chromium/files/chromium-91-system-icu.patch @@ -0,0 +1,29 @@ +From a0ddb153bdaf0ef83c8bfec744fedb97bf4ccfd0 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Fri, 16 Apr 2021 14:09:29 +0000 +Subject: [PATCH] [unbundle] Use char16_t as UCHAR_TYPE + +Overriding UCHAR_TYPE was dropped with: +https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2732628 +--- + build/linux/unbundle/icu.gn | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn +index 0f52fc1..33a0121 100644 +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -16,7 +16,6 @@ config("icu_config") { + defines = [ + "USING_SYSTEM_ICU=1", + "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", +- "UCHAR_TYPE=uint16_t", + + # U_EXPORT (defined in unicode/platform.h) is used to set public visibility + # on classes through the U_COMMON_API and U_I18N_API macros (among others). + ] + } + +-- +2.26.3 +
