Gentoo Archives: gentoo-commits

From: Stephan Hartmann <sultan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
Date: Fri, 02 Apr 2021 20:56:11
Message-Id: 1617396949.264fd3c8de9486fb33b2893be8a42f138f182411.sultan@gentoo
1 commit: 264fd3c8de9486fb33b2893be8a42f138f182411
2 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 2 20:55:10 2021 +0000
4 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 2 20:55:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264fd3c8
7
8 www-client/chromium: dev channel bump to 91.0.4464.5
9
10 Package-Manager: Portage-3.0.17, Repoman-3.0.2
11 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
12
13 www-client/chromium/Manifest | 4 ++--
14 ...91.0.4455.2.ebuild => chromium-91.0.4464.5.ebuild} | 19 ++++++-------------
15 2 files changed, 8 insertions(+), 15 deletions(-)
16
17 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
18 index 5905730e608..218d78fcb08 100644
19 --- a/www-client/chromium/Manifest
20 +++ b/www-client/chromium/Manifest
21 @@ -2,6 +2,6 @@ DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bf
22 DIST chromium-89.0.4389.114.tar.xz 890898912 BLAKE2B b9590f83eb54fc1b524a7893f8ce0317cb5648aae84853b8958f2a0f65ae2f8331e65732322f4956fb5bc58ef3691755ae66ed901567e2b5a9749a99fc6096c4 SHA512 5b8d92ecde3ab35847dc4981caa12434334f81fc576e8809c5832a18989b6d1465ae8c43f0ad0ea8a3da7a5876c52679c57ec8323109de2b81ac467419fa1a4c
23 DIST chromium-90-patchset-6.tar.xz 3828 BLAKE2B bbd1378868cf4d699ff097ea41226ff694d58468f8f93860f2d6cc60924f35fb1f0b17fcf5a916f04545171d1219b699072222f138240fd483c704874cfce178 SHA512 70321eb4e9fe27818d5e6ae3109d3871a870a7fb6886328dcc9fc8291ac72fc003d678aec7f9925afe0c5667c70ce9bca8f61434b11a331fc1a29d61ad7b59e3
24 DIST chromium-90.0.4430.51.tar.xz 917340456 BLAKE2B ae01c4f5cb146ae5c488b47480124dfa65f6e1dc529d4b551109283d07ab5aa6f9e6d1e1c070c28ff9e4bc8b5b877ccb9886c23772183d0618667686f03f3ce0 SHA512 9a064c2f8029ba335720d9135b90a1714f57180ae0305e5dd62230b722770c39709fd52133dbd078e817c62a90079ee322fb7f198353593f52584a856c8d879d
25 -DIST chromium-91-patchset-2.tar.xz 6992 BLAKE2B 8639873f0f805c88ba41b97f06ef583498f58664c012afe4e8d185ddd42e6380cd331d0df9101f5b1e30c73cdca13c267d19592df100db3f1a23cabfc871ae00 SHA512 f5d7377be13f6f201f572215dd7fd1d57c755c15263cf91e5d80c4d8e77be2a371c4c236b9f621b7471451904fa8886357ef2c8907b5e748f0ffce3ebca5ca33
26 -DIST chromium-91.0.4455.2.tar.xz 933340784 BLAKE2B d63a022aad7d3d490f524e2cdcfed1c314227882b861a67213f8a9f231ed53e265c72754296a17e54f8760454c2d7d7bcaae90980a1994ae42f899fa537efdfa SHA512 2c6b6a74f9aaea1b17c9f1fbd580cfec093ec17461056cb5594a12e8f4c4f7a594a449027210deb0c506be9906d11624ab3d7ae35c20a9ba665a9dc8995287d8
27 +DIST chromium-91-patchset-3.tar.xz 3256 BLAKE2B fcca836134e5a8fdd43a2bd7fc588b02ae0827cbee2c92ab35b0472ff1c3f416ad34fe7dbc4937eed94b52ac3a42f349b85f3ee467f45287b201270300439c0a SHA512 3817e17ee180185fab0a21f575f57172b9995cd27cbf78ee3071b8fa3ee093437c4a3926e13381bd417f4d984abc50f2216e6e19f537583e5b6954ee50dc00ad
28 +DIST chromium-91.0.4464.5.tar.xz 933757036 BLAKE2B 76ea72d5a3500e85dde293b7cb86e7de2d70c835b78526ddcf84d2fd98240c5960ce1c30425b4cd51c0a70671af21bf3a9073f36801a1639c83280dc9d91045a SHA512 3f585de9f65f6a4d7224fe5a9e4273353767754b4788a50c55816ecf59eefd7acead386d85b70fac226fe3a4be83205c0502854187b4cdfac3ae02c060bd30ec
29 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
30
31 diff --git a/www-client/chromium/chromium-91.0.4455.2.ebuild b/www-client/chromium/chromium-91.0.4464.5.ebuild
32 similarity index 98%
33 rename from www-client/chromium/chromium-91.0.4455.2.ebuild
34 rename to www-client/chromium/chromium-91.0.4464.5.ebuild
35 index 25523111680..6039af1867d 100644
36 --- a/www-client/chromium/chromium-91.0.4455.2.ebuild
37 +++ b/www-client/chromium/chromium-91.0.4464.5.ebuild
38 @@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
39
40 DESCRIPTION="Open-source version of Google Chrome web browser"
41 HOMEPAGE="https://chromium.org/"
42 -PATCHSET="2"
43 +PATCHSET="3"
44 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
45 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
46 https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
47 @@ -22,7 +22,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
48 LICENSE="BSD"
49 SLOT="0"
50 KEYWORDS="~amd64 ~arm64 ~x86"
51 -IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
52 +IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
53 REQUIRED_USE="
54 component-build? ( !suid )
55 screencast? ( wayland )
56 @@ -94,13 +94,11 @@ COMMON_DEPEND="
57 )
58 )
59 "
60 -# For nvidia-drivers blocker, see bug #413637 .
61 RDEPEND="${COMMON_DEPEND}
62 x11-misc/xdg-utils
63 virtual/opengl
64 virtual/ttf-fonts
65 selinux? ( sec-policy/selinux-chromium )
66 - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
67 "
68 DEPEND="${COMMON_DEPEND}
69 "
70 @@ -184,10 +182,6 @@ pre_build_checks() {
71 if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
72 die "At least gcc 9.2 is required"
73 fi
74 - # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
75 - if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
76 - die "Component build with tcmalloc requires FEATURES=-usersandbox."
77 - fi
78 if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
79 CPP="${CHOST}-clang++ -E"
80 if ! ver_test "$(clang-major-version)" -ge 12; then
81 @@ -478,9 +472,6 @@ src_prepare() {
82 if ! use system-icu; then
83 keeplibs+=( third_party/icu )
84 fi
85 - if use tcmalloc; then
86 - keeplibs+=( third_party/tcmalloc )
87 - fi
88 if use wayland && ! use headless ; then
89 keeplibs+=( third_party/wayland )
90 fi
91 @@ -508,6 +499,10 @@ src_prepare() {
92
93 # Remove most bundled libraries. Some are still needed.
94 build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
95 +
96 + if use js-type-check; then
97 + ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
98 + fi
99 }
100
101 src_configure() {
102 @@ -553,8 +548,6 @@ src_configure() {
103 # for development and debugging.
104 myconf_gn+=" is_component_build=$(usex component-build true false)"
105
106 - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
107 -
108 # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
109 myconf_gn+=" enable_nacl=false"