diff options
| -rw-r--r-- | www-client/chromium/Manifest | 4 | ||||
| -rw-r--r-- | www-client/chromium/chromium-93.0.4542.2.ebuild (renamed from www-client/chromium/chromium-93.0.4535.3.ebuild) | 29 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-93-InkDropHost-crash.patch | 25 |
3 files changed, 44 insertions, 14 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d7028ccff4c0..18e984aa0703 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -5,7 +5,7 @@ DIST chromium-91.0.4472.101.tar.xz 950228560 BLAKE2B 441ef6106c09e24ae5b0ebbcebc DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f18f3bf769fe90ca423692f8e8d9fabd36fa8cda7a66f870fc30478ea4e1f9bd147bb6cadb77df4d9e0ef846c30e653b15dcc98 SHA512 142507bbf5fcc47d7eeb5f890ed70eae403271a7f537903545ad09ac26501aae914f327c3287d5588ed4ab601012584f6204cca6896ed2705326b090df2fe00c DIST chromium-92-patchset-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b DIST chromium-92.0.4515.51.tar.xz 957598564 BLAKE2B 5b911148153cae7058522d155b671c96f94a42621b9e0c371a82acb953de5bfa0baa1c6fe410a8e23d1ff77756437c39bab809cee1f95634ab1abb87ff5456b7 SHA512 63bb8012b7f0cec81bdb13e0acf1ef43e996cb3c66f2374933741c21fd906a6e0ce88e16b4772d4f14cb197c3e35f99235b56021780e405d245b5721096ae732 -DIST chromium-93-patchset-2.tar.xz 4844 BLAKE2B 34036f2529043329ef33f142c90929504445c8597fbee57f5614579672f88d71ee3c8eb4b0864051fbeaa30ff4a6958a2f71240b11a84d7ebb695b6b90bd21d2 SHA512 db25ef16f82947d2f9971648dbdd41b1c30e6323d85535c6fd6dbcae9d408606cd9c55a609140aa6baff072d2c71fa811bc2fe8fca465004b734690f8f875744 -DIST chromium-93.0.4535.3.tar.xz 966263580 BLAKE2B 88166ea8f11f41aa088859ecd193873d695ca04731d36d795a8d31f1b49884235203bebf93c80531003b5c6d6fcc73bb14715d3c8284240cb4400c8c05a09eb0 SHA512 b09eff9129ea9e1cdfa72747d30f624b223c07622536b085096652e48d7c1e72aea2de08bb77533ef4101a707474c8bf3cd861b43fa589a70b536f46b4b3af73 +DIST chromium-93-patchset-3.tar.xz 4848 BLAKE2B eb46541d283f8c17967ad45ac36838f9f46f20883eb13260c5804aaf805736283a7890e5f76ab7c1dccfd218bbf55cfbb04378c116c4e390a575c91511308aa7 SHA512 be61f3c907899121e08394647c276f638201e6c1a2d682fac0e559117866e3c1c40fd6283159725504d699b6ad6ef773e980e0e98487aafb80f1c458a3b55959 +DIST chromium-93.0.4542.2.tar.xz 988397092 BLAKE2B 9491aff480ca5200b0ebfa0ddb2082cffe7f86475241d99c320a4c415e36df81696d14323219e8d2a62ae0cc18bdbc03a8f5dff57b95acf25316b842b9c1c648 SHA512 28e00b6e343e74a6abb0d9c60017e37c6ec5e577ac292232cf7d6f13176edc1663f2c4fd5a18a5436b76055d9ac7ec2b4c477dbe59a9a963bd62d447aaf8c56c DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-93.0.4535.3.ebuild b/www-client/chromium/chromium-93.0.4542.2.ebuild index 6274a641629a..c99ac3f994ef 100644 --- a/www-client/chromium/chromium-93.0.4535.3.ebuild +++ b/www-client/chromium/chromium-93.0.4542.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_8 ) +PYTHON_COMPAT=( python3_{8,9} ) 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,10 +13,9 @@ 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="2" +PATCHSET="3" 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://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )" @@ -106,10 +105,11 @@ DEPEND="${COMMON_DEPEND} # dev-vcs/git - https://bugs.gentoo.org/593476 BDEPEND=" ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') >=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 @@ -178,6 +178,10 @@ them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS in /etc/chromium/default. " +python_check_deps() { + has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then local -x CPP="$(tc-getCXX) -E" @@ -229,6 +233,7 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" "${FILESDIR}/chromium-92-EnumTable-crash.patch" + "${FILESDIR}/chromium-93-InkDropHost-crash.patch" "${FILESDIR}/chromium-shim_headers.patch" ) @@ -248,9 +253,8 @@ 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 + # adjust python interpreter version sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die - sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die # bundled highway library does not support arm64 with GCC if use arm64; then @@ -258,6 +262,9 @@ src_prepare() { ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die fi + # lastchange.py requires initialized git repository + git init -q || die + local keeplibs=( base/third_party/cityhash base/third_party/double_conversion @@ -477,7 +484,6 @@ src_prepare() { third_party/xcbproto third_party/zxcvbn-cpp third_party/zlib/google - tools/grit/third_party/six url/third_party/mozilla v8/src/third_party/siphash v8/src/third_party/valgrind @@ -648,6 +654,9 @@ src_configure() { # Disable pseudolocales, only used for testing myconf_gn+=" enable_pseudolocales=false" + # Disable code formating of generated files + myconf_gn+=" blink_enable_generated_code_formatting=false" + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" @@ -799,10 +808,6 @@ src_compile() { # Calling this here supports resumption via FEATURES=keepwork python_setup - # https://bugs.gentoo.org/717456 - # don't inherit PYTHONPATH from environment, bug #789021 - local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0" - #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die # Build mksnapshot and pax-mark it. diff --git a/www-client/chromium/files/chromium-93-InkDropHost-crash.patch b/www-client/chromium/files/chromium-93-InkDropHost-crash.patch new file mode 100644 index 000000000000..54d16db56cc2 --- /dev/null +++ b/www-client/chromium/files/chromium-93-InkDropHost-crash.patch @@ -0,0 +1,25 @@ +diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h +index bd0975b..e5df288 100644 +--- a/ui/views/animation/ink_drop_host_view.h ++++ b/ui/views/animation/ink_drop_host_view.h +@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost { + // Used to observe View and inform the InkDrop of host-transform changes. + ViewLayerTransformObserver host_view_transform_observer_; + ++ // Declared before |ink_drop_|, because InkDropImpl may call ++ // RemoveInkDropLayer on partly destructed InkDropHost. In ++ // that case |ink_drop_mask_| must be still valid. ++ std::unique_ptr<views::InkDropMask> ink_drop_mask_; ++ + // Should not be accessed directly. Use GetInkDrop() instead. + std::unique_ptr<InkDrop> ink_drop_; + +@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost { + int ink_drop_small_corner_radius_ = 2; + int ink_drop_large_corner_radius_ = 4; + +- std::unique_ptr<views::InkDropMask> ink_drop_mask_; +- + base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_; + base::RepeatingCallback<std::unique_ptr<InkDropRipple>()> + create_ink_drop_ripple_callback_; |