diff options
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/Manifest | 5 | ||||
| -rw-r--r-- | www-client/chromium/chromium-109.0.5414.74-r1.ebuild (renamed from www-client/chromium/chromium-109.0.5414.74.ebuild) | 18 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-109-system-icu.patch | 58 |
3 files changed, 69 insertions, 12 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index f07c7159a826..807f99f2d82f 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,6 +2,7 @@ AUX chromium-107-system-zlib.patch 423 BLAKE2B 041cfcf5840fcf28b382f27275b3ab057 AUX chromium-108-DocumentLoader-private.patch 1310 BLAKE2B 113a73429cb8cd9055bcdcb52c365800e814309f38285c36e1a691db26d2137383cfec47954b4712df0efde2b48481572f5311aedfa8f8b66caa105a23f7ce90 SHA512 218e28848a2d80c60905c0b8c032317e68707ce72f4d360a0d8cfe48aeb0e04d27f0880beadd6010da90f0204b60fcbfea746d66ce0cdbc0d7566d3c34ea6421 AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c AUX chromium-108-revert-GlobalMediaControlsCastStartStop.patch 1389 BLAKE2B 0596eeba11801e7aed3331d7b42c407214d0e7d45dcf7c96b9320f0f5a4da8a01b7e6b02888971d0d1dc8c23d0e02286f07b5f1ebf336d7dda1cc7bbb018897b SHA512 6d1eacab96ed3b41a905a282e9ebf71bd906541bcf094dc55543a66382a5ae28bf698ee31cea5485925cd538cbff0c35d195016fbc9ef6a54f61fbaca1b6a1e0 +AUX chromium-109-system-icu.patch 2096 BLAKE2B 8c220e94a3a13e39527d8573e3f102e2ff442b593e7a1d2782a0265cf8160ffec3642b7b69118584364b887f6cfaec1fd2ac17e3f4c287dba6afa3f492662b64 SHA512 8668a3fc29338c63382d98dea5cf68a908e3bff60d0044265817d427988cfcca515b54390443d28db243504ebc090a2617186b03d2cd867bc3c6f22d8e34cdb8 AUX chromium-109-system-openh264.patch 577 BLAKE2B ec83d9a72a163683d791893e6b72fd5a6ffaa18d611bc6e6785819292370cc9f4fd37d8d3a33ecb5621beb33a3271df00d7a1b629300fdfa8db6e4e4eb196f1e SHA512 5ea73c8522619d83047fcd429988b24687e928e01c2915ef4145469fbb1238ef4a72beca73493794e2275b855f95412355700579a31649d64d74133ed815f1cb AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff @@ -17,13 +18,13 @@ AUX ppc64le/fix-swiftshader-compile.patch 1112 BLAKE2B fdef119a93c67ce7864a312ef AUX ppc64le/libpng-pdfium-compile-98.patch 412 BLAKE2B 0a2907e1c01696fb41b039de139ab934af9af3c2a9f8257fe10a84fd0b41d52ca79150ad996d140be0dac30fc9a0dd5f83ec8fa3cd4dc7e0dcf38fab99a20f55 SHA512 c4693f612191f73205630dedd77ecdf345f094468a8ac31ab39ad1155ab0026f782d1fe30a3a63999790c7cfa6d9061e0f9c011f9dc1f9f5fe7562217a2aedfa DIST chromium-108-patchset-2.tar.xz 6480 BLAKE2B 2a40bb741fdd305b3525b790f82c2b36f6c909680788527a31aa2a11f519ff630aa12ffe7c53553b717f1909978c77e7db07a02a86c8e7d12d63375402802d7a SHA512 3fe182f0f928baaf0f5521efa8763080de765240b5608d5126e84e49335eb5edc788ab406aa71f5fa97c371afe1f6808e93e2e082c7f65169b5f157ff6c3e00b DIST chromium-108.0.5359.124.tar.xz 1731649648 BLAKE2B 1e5d2f58eab7303a8feaba105fc6739be69f27543876cc24a8ca21076461c6b5bb032f0ca29f79119d58487a62206647623dd52970f21a1ca1247b17c7a14f16 SHA512 e9bbe2c3d376265449216cc2f6f8ab1c94871387e1bf12f0af28b8d3bce299cee751b20283b1c832e887e38459d7928e8e8c0c8027514cba48a64cc15f8762a6 -DIST chromium-109-patchset-1.tar.xz 5736 BLAKE2B 25131fd64ef3d95920bd1c74dc16fd33322e166542bd4f4c279c0f6394b0c32ad95da1d864adc78a99f0f62aefbac36cd2ace553354252e0d8440b16c9aca0c4 SHA512 d4a6beecff2f8de07c7e96fdfe75a8e7a34e97a4d349c055a30b08917a85c01db05c77c086f6247d5714bfff38ee8d1feb9e607538af880db13ca4327bdf460b +DIST chromium-109-patchset-2.tar.xz 7280 BLAKE2B b7f86dbb6c40005df67764a7dea57c845010a97ed52e542da0c91182b828d74b2b7266db9b9d21bb9349c83a6c56f4721bbf9fd440e83d3356155ff5f6337719 SHA512 3ec55aa9031cd2c82f99233700c9d3a62eeaef792724254b2d0605f597ba7446fffa0afa81166145aa0ff6e64c78136fe18b7231afe49dd2f33de2c7ae27de15 DIST chromium-109.0.5414.74.tar.xz 1747778008 BLAKE2B dc2893c59398caf72546c42ada961215ce1b25785da66272b72fe14ac0db00ac4282b0de5ee65cca932e273fe69f41704b4ee2aa173d21da535708e8d0aab633 SHA512 79ff744b813e833ab4f257361a2f1847a57df579b9c925bad7575484f079c4c1b0b1c59c2c48e683bcee27a79e4bfd87f96c83fa28e0209ba4d3a71340842579 DIST chromium-110-patchset-2.tar.xz 11196 BLAKE2B 97a4d65f9cdc1cdec15ddcee8561b6fef9d6ce8ea667c4c779da56b3665ff8fd67f2e81d8b55cf9709575c96e29545c4ab81b02dcb5b3fced7185cb9f43d63d2 SHA512 cff28487a6739cdffb007566c1b71977c87394bd2912e9b3ee32c9349bb0c1d882e252a2264132d908393bc5440520e3ea93736e1a0f155211280cab7d605037 DIST chromium-110.0.5481.24.tar.xz 1703153748 BLAKE2B 8fa030928d51d9ea0a6aa4a674bb1e731e89833da146575f1e617e2e4fb4a7d55f963ba855341f2564488b4464b52d4aaa9d0f789e4f7f1dcb35df6f5e0232aa SHA512 49ff6fcfcc4a1cc30e073fa421fced527e2eb7248a1dfde5da91768a91ea69aa113934f80865ffe590a3c417634c5f7a2fe04145b199a2b4d751ea386f297e9a DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c DIST chromium_108.0.5359.71-2raptor0~deb11u1.debian.tar.xz 439020 BLAKE2B ef900e3978b03c7330147b338266694f2ea4bafee8a34fb871bd7548a05c9276c25e8c34dd26875ca552db758590c4e4a80ae411c2fe658e485d9dca6e55adae SHA512 99486b35c5eb718e25faaddd526970969f5d8c4c74f3c17f64f6fbe25f45a0764643bf746644b205ac27d13912f36eba6f497a0552d7d96d1af4a569d895e64c EBUILD chromium-108.0.5359.124.ebuild 38689 BLAKE2B bee7526fa917c57a74d35901a6a719a631275504f3b0a81c90b56103c64e7e5e0e4556926d38ff56cab90f262d8a27cb03ed5d9f93b356a9f01a3d81589716f3 SHA512 a1a5055cd5df439cc1af97a6832b08a543adc9cddefec51c64e8c3f6197584cab91ae2dce0d38345505fb90d8f7acdc0f132c9cae80a50929137b3f7d9727423 -EBUILD chromium-109.0.5414.74.ebuild 38304 BLAKE2B 00ed103ae07e693bec03dbb83911c5415e4cda10a86f15ab7a137dd1b5740444a88355f3a9395fb12ed42901c8f8eb5c4acd55b7d419f9100a42ee3d19d0ed37 SHA512 5ac9c373346f1262ae68c1523ea89d7245fe58d47e8507fb0d9ba675d8178d42e03e9c0c1d180ed9423f00ac6b33d0b134097f256cb85da4afa56411c2519f3c +EBUILD chromium-109.0.5414.74-r1.ebuild 38284 BLAKE2B 328c7068a19fb395313ffe07e5685fdbbb5549d97fa3e00cab87a17ed8e800a981e14af00e59208c554e5201132074cc9cfb4bbfb88836c8a2244e97afd8cd24 SHA512 b165a37abd025eac186710a5cca66af10bc4dfd5367c41401c42c321d9e759efe5dae8ab91ebb1c5c6f97485f5a39b2fe8656529ddb64afb3dfe6753368710bf EBUILD chromium-110.0.5481.24.ebuild 38262 BLAKE2B 9211e2ae35ed086d0842a7893d42b68fdc67a6ad7dc3fa6455dbbe506c41e41b16f672ea09fcd2d47d352c70832ee658c69bdff497fdc2ceff8f4066f0a05e43 SHA512 28e96525b00b21f94df0daf9a3d9b47015a78c27926396f1115b99638eb29ec4a49e9eb0a2d09161e1d0b67542dd8704e0fd4de47eed1106a50af4d0f7bbc92d MISC metadata.xml 2216 BLAKE2B 4cf7512e95f4ac85e73b20acee35f5dbe6eb7744fa3b82d6ec09d92e76ddc61d67cc3a43fd82d02326c5a9364e1ca9c5e733a814b85e4d35ad3fec8239ab3917 SHA512 db3bae20b7b70026dddaff8a1154d99dc99ff1779bcb47c05d5f1172763cf2139edc4708f84c2017b6a57fdb18d3f59bdd3ec474f2c04def30405ac584929c5f diff --git a/www-client/chromium/chromium-109.0.5414.74.ebuild b/www-client/chromium/chromium-109.0.5414.74-r1.ebuild index c740692317ab..67a1e38d6624 100644 --- a/www-client/chromium/chromium-109.0.5414.74.ebuild +++ b/www-client/chromium/chromium-109.0.5414.74-r1.ebuild @@ -17,14 +17,14 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg- DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/" -PATCHSET="1" +PATCHSET="2" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" LICENSE="BSD" -SLOT="0/beta" +SLOT="0/stable" KEYWORDS="~amd64 ~arm64" IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine" REQUIRED_USE=" @@ -266,6 +266,10 @@ pre_build_checks() { if ! ver_test "$(clang-major-version)" -ge 13; then die "At least clang 13 is required" fi + # bug #889374 + if ! use libcxx; then + die "Builds using clang fail with USE=-libcxx" + fi fi if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then "${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly" @@ -320,17 +324,10 @@ src_prepare() { # Calling this here supports resumption via FEATURES=keepwork python_setup - # some web pages are crashing - if use system-icu; then - sed -i -e \ - "/\"TextCodecCJKEnabled\",/{n;s/ENABLED/DISABLED/;}" \ - "third_party/blink/common/features.cc" || die - fi - # disable global media controls, crashes with libstdc++ sed -i -e \ "/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \ - "third_party/blink/common/features.cc" || die + "chrome/browser/media/router/media_router_feature.cc" || die local PATCHES=( "${WORKDIR}/patches" @@ -339,6 +336,7 @@ src_prepare() { "${FILESDIR}/chromium-108-EnumTable-crash.patch" "${FILESDIR}/chromium-109-system-zlib.patch" "${FILESDIR}/chromium-109-system-openh264.patch" + "${FILESDIR}/chromium-109-system-icu.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-shim_headers.patch" "${FILESDIR}/chromium-cross-compile.patch" diff --git a/www-client/chromium/files/chromium-109-system-icu.patch b/www-client/chromium/files/chromium-109-system-icu.patch new file mode 100644 index 000000000000..ea1be01d9270 --- /dev/null +++ b/www-client/chromium/files/chromium-109-system-icu.patch @@ -0,0 +1,58 @@ +From 4885090741554be61cb2ed10194cefb29bf8be64 Mon Sep 17 00:00:00 2001 +From: Yoshisato Yanagisawa <yyanagisawa@chromium.org> +Date: Wed, 11 Jan 2023 23:51:39 +0000 +Subject: [PATCH] Fix the way to handle codecs in the system icu. + +The previous code does not register codecs whose standard name is +different from the bundled ICU. As a result, looking up such codecs +seems to fail unexpectedly. + +Bug: 1382032 +Change-Id: I8a61f77d0f70104415d24dd954b3b7061ffca556 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4154277 +Reviewed-by: Kent Tamura <tkent@chromium.org> +Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1091571} +--- + +diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +index a70b359..33ce43f 100644 +--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc ++++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -116,6 +116,10 @@ + continue; + } + #endif ++ // Avoid codecs supported by `TextCodecCJK`. ++ if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { ++ continue; ++ } + + // A number of these aliases are handled in Chrome's copy of ICU, but + // Chromium can be compiled with the system ICU. +@@ -144,12 +148,13 @@ + } + #endif + +- if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { +- continue; ++ // Avoid registering codecs registered by ++ // `TextCodecCJK::RegisterEncodingNames`. ++ if (!is_text_codec_cjk_enabled || ++ !TextCodecCJK::IsSupported(standard_name)) { ++ registrar(standard_name, standard_name); + } + +- registrar(standard_name, standard_name); +- + uint16_t num_aliases = ucnv_countAliases(name, &error); + DCHECK(U_SUCCESS(error)); + if (U_SUCCESS(error)) +@@ -289,6 +294,7 @@ + continue; + } + #endif ++ // Avoid codecs supported by `TextCodecCJK`. + if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { + continue; + } |