commit: f3f649046d31ebdbc8c4a302b2384504eff78027 Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> AuthorDate: Thu Jul 16 09:24:59 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Jul 16 17:37:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f64904
www-client/chromium: dev channel bump to 85.0.4183.26 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/16716 www-client/chromium/Manifest | 2 +- ...chromium-85.0.4183.15.ebuild => chromium-85.0.4183.26.ebuild} | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 15c97143a22..73225f51e0b 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,6 +2,6 @@ DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e0371 DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664 DIST chromium-84.0.4147.89.tar.xz 845153972 BLAKE2B e8101805af6278fc9c49041071e7cd6d53fe79ba74b83b636584db57f459f003559758a51a1cd155d7fe3d5d0d21c95d37f84e638644c6e08b39ea02cce902be SHA512 cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e -DIST chromium-85.0.4183.15.tar.xz 863644932 BLAKE2B e244ff567894c5fce623bfe0e799130fcef447fee26469fcdda3c372ddf054e354d6ead7201332f1aa5e91d0826d838de1af5838a38d1e4849511fb4d96f5e08 SHA512 e92b8325b27e485ff2ac0db5c47661c935f874a9d2d0c6df597bb02faa448ff54b81e7528619bc0dd28b523852e03e4ff8bfddfa9ddcee3d27d9cb39eef1af0a +DIST chromium-85.0.4183.26.tar.xz 863782884 BLAKE2B a08f042f07b96e490f8e2d7ca132a249f2745296ad5250bfb65550e632483cfbae3a60ed42fda5608bbe7ade3356b84fb4dea7d4dba5dbd7c284a3c5c46e0199 SHA512 00267e64bcbb8c464fa624e203bbfde9d6dd324d70a83ef903e5cec0332ddf6fd540c742fce99c23931522e57e54e46280cda7dc0e085b33cf2c36ef45bbd935 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 diff --git a/www-client/chromium/chromium-85.0.4183.15.ebuild b/www-client/chromium/chromium-85.0.4183.26.ebuild similarity index 98% rename from www-client/chromium/chromium-85.0.4183.15.ebuild rename to www-client/chromium/chromium-85.0.4183.26.ebuild index c6722ddf559..dd5f9553613 100644 --- a/www-client/chromium/chromium-85.0.4183.15.ebuild +++ b/www-client/chromium/chromium-85.0.4183.26.ebuild @@ -12,12 +12,10 @@ 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/"; -XCB_PROTO_VERSION="1.14" PATCHSET="2" 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 - https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"; LICENSE="BSD" @@ -423,6 +421,7 @@ src_prepare() { third_party/widevine third_party/woff2 third_party/wuffs + third_party/xcbproto third_party/zlib/google tools/grit/third_party/six url/third_party/mozilla @@ -693,9 +692,6 @@ src_configure() { myconf_gn+=" icu_use_data_file=false" fi - # Use bundled xcb-proto, bug #727000 - myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\"" - # Enable ozone support if use ozone; then myconf_gn+=" use_ozone=true ozone_auto_platforms=false" @@ -730,8 +726,7 @@ src_compile() { python_setup # https://bugs.gentoo.org/717456 - # Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support - local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}" + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}" #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
