www-client/chromium: sync w/ upstream
This commit is contained in:
parent
5a0abf6650
commit
0d57bc5a16
SSH key fingerprint:
SHA256:wyRyyv28jBYw8Yp/oABNPUYvbGd6hyZj23XVXEm5G/U
10 changed files with 154 additions and 1598 deletions
|
|
@ -1,13 +1,12 @@
|
|||
DIST chromium-123-clang.tar.xz 50178332 BLAKE2B 4b5c4f81a83c7b0c809c93a713e869fde6fe559477665cb3b2f03c62d2175f821b81fb03b0ddd127c6eaf77c41011b4de06561f09a58384153d80fe2b3aa7427 SHA512 17108b9579f16d0da383bd5e41d012f94bcb8445a517ff823aa49b66d3861b0a124b6cce6183fbc64e8050f1ebcd65a9daa2acbda5fdaa42390bfbf4ecb16bd3
|
||||
DIST chromium-123-rust.tar.xz 145295100 BLAKE2B ae6603a0e0218e4e39d3e8b7aa48a2cd946c90779dac48be26582926963c8a10a48e3e58fd00a23cb8cd9a3584d9d4a142e843f93c761e862253817635f18c2c SHA512 b4f8dce6d74be4be495d9948d7593ec9664c0b93e87456fab33d3ae5ac0e486a4e8576b26a9ab9890285a7c0d566afb803b98225c0692b6cac9f623a10b954a2
|
||||
DIST chromium-123.0.6312.105.tar.xz 3481204616 BLAKE2B 8adbc4a0c96ea53b45b26a48c8eb94e29b31b981471a0d5fda4cdea1f7aa69714a9e5a5729a61a49a92b6322889ee794b4c7ac5e243bc495ff5bd04cdc59f616 SHA512 a1abbba78c96fd7bc44a23b21d8180ebff015d17abcb186dece595513fda9d4443ac67498a78181589884c384a48e6c3abfe72e6ee806fdfc764d05f13fb5cb6
|
||||
DIST chromium-123.0.6312.122.tar.xz 3488275388 BLAKE2B 9f7e6c4984a41dbed6849eee08d4f6b8241c86ece0250d67786038980f3d7f208897f42b279c20ffbb965e8e49427ce74e896c34b40390321780b9cc2ba685ce SHA512 23e13d1d5758aa771f4c66e1a55068438e7c4890456dcb0b7a1fc1839b750e612e29d59e744c8b773935757aad01b78a5fecc3e03057a8acbb7e997dbb98f007
|
||||
DIST chromium-124-clang.tar.xz 50212876 BLAKE2B f4786d4192306c005ce790ec3fc2595055d7a835b438e3c7a101b2c56653ad0ef3eb7b797224c9fe910c7ccd31c7cad50d502411ef220d151a8a1b432610d6b8 SHA512 4fb7bbb8abc9b3ae065b32215327d5de58e27c20c0199a8c243a9bfb89bf95b932ac1c2162e65acc954bde5975373a40ccada346cd0340d89889a12e4b8b96df
|
||||
DIST chromium-124-rust.tar.xz 145977368 BLAKE2B 3fccaed3a1f7b85a303f5e4281d0d7fe0d194f3203751bae4a937f3447260ecfa5141d49b945705d69d36e89901b99fd0955ce0e5bcff0c17c7096fd78782722 SHA512 272ef52b5b201aeb056db7339387504b78252411899ea13ed5829b77bab8c76fd84125d68678064ac204fa48caf16f86ee1d99c64d599d955fb1097d5e46fc51
|
||||
DIST chromium-124.0.6367.29.tar.xz 3427137984 BLAKE2B f9932b932a50c640c5ad946b72896eb6feb56fa2abc9c6d90c7f5446993dd44b7f0c9df6e3c0e5faf8c38894e17847e86716aceabf6c5ae3467ea971ce8ed1d1 SHA512 75d881e782253af6582c7de337ad4fcfc304d35707bd77d1a650bd0df311c6a6ea114b48fc6cfb5e0d98bc5d24cef6223441c8b7e3a267db71abd2af2e116721
|
||||
DIST chromium-patches-123.tar.bz2 4697 BLAKE2B 8a7dd76edb23afb7b2f65084696bce5d6e54d63ca34c4590052db1086ed0a422b1efde863c4daad4e2526f329eb65276b9ad5406017cd97fb75b1a9556c1f933 SHA512 ea47255deac1893896f64496629d34c7092f266a175b8400fcf4f01b9d038ae240e911bff488558bb28e6f5795bbcf276adf20ed1e0ccb8ac99f9ddd260742f9
|
||||
DIST chromium-124.0.6367.155.tar.xz 3446276744 BLAKE2B af057b9c1053878294ce3a4dd5777dc260c123a8c069dc8526572f3c4d51ca0f720cc3916df4fb6204912128a5def82a9f04ca71cd19c292413d711bf1516388 SHA512 632158c82c44c67b4d7e67c646f671f2ae4344d40759cca4269c024c1ad2be2740e67dbf0e4200a4da996d7234f0ef5c51a20c90433612775ddf7d5f94e1ae09
|
||||
DIST chromium-125-clang.tar.xz 50745124 BLAKE2B 6d9a8752a648c5e202c5597dd1adf52af9d37784166f75ab803a6dfbb4cd88e57f88851052f005d388020cd840d6854cbd295220f519325d5bfa3174ed9115dd SHA512 32200f39c1d4a24db30d67bfd324490c9fe4fcba2efb7bf83b6db14944a772cdd256dad93d7e23bf9efefc6c98007afde06ba7f8f2a1aafa7e27457e2193e23c
|
||||
DIST chromium-125-rust.tar.xz 150461068 BLAKE2B b62fd93d4de25803da5eb98f67c25c455d7ae8e86f202e614bcbe9787957e63ec01ef3eabde3eb7a69d51d25a95a32577477e69ab71c008dcb55411f6d755433 SHA512 6cedf2cfdfefea782c7f1b1b13daae8e44f0678cb2a92454cdea5cd95ada14bd331fc5634da0267369743ab31d9d73ec30d971bdd7a9b68c2f2270a22c552b8c
|
||||
DIST chromium-125.0.6422.26.tar.xz 3444217168 BLAKE2B 102b7c49728717e3f76760fd2b92a666423c9d86fd68acce41c06fcf39b8724b3bd14934d2760d3fbc5aeabf7a2052894a0829addfba0ee44bfba37adbdf21e9 SHA512 75c026bde0fc9c9020af6883c8a4fcf0beb6c4d46be390b3bedadc07899b7cca10f91931425c19128d55206f61ab9953373826c67b11bbfbcf2f883802a48733
|
||||
DIST chromium-patches-124.tar.bz2 4706 BLAKE2B 5acae233ce7b43669dbf65c368467f94c9a0ec509713ec4510943ede12d495dad1670a5c0a7435e0e16251c7429145e575cb1c9661439ff1c626d709856b6a94 SHA512 3d0d365b6d484def626153b07c0ab187195f27ebada63bd2547b52ed1e2157aab2415a6140c293a140d7a0545ae0fc1cdd431b37fa0c4a212a34c13baccb358c
|
||||
DIST chromium-patches-125.tar.bz2 4688 BLAKE2B 96cffec1931f59bfad53efee930292ca123e3daf3cf6f062583aae15853283c32ce2f564de7e35b678a34ed7981d5e8796059d00d5409c31d3e2e5839f93cf9c SHA512 fe4173b2409002d52fd443e87ce4894b53d0b24808f002766942086b99174cb9da42b6e7f92d80d6432d78d7ae3458265ec6cf091a76d0e4e25b44dfdd438dcf
|
||||
DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
|
||||
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
|
||||
DIST chromium_123.0.6312.105-1raptor0~deb12u1.debian.tar.xz 579484 BLAKE2B 587082358377f7bc0dca0dec83772abb7e040ad894ca4d456a294b7f5c19297acbc5b1dac725d3c1dbaaeefd480328c6c06c607438e560aa6359c1e98c4b1c9c SHA512 6b670a139e284cc96da65ff3c1b3e715cd9b436de2404792d619cfad23e2040fd931e7cc49f0b1ac17e11522804a4c9a621cb943e0dab33fb5bf422e954c5421
|
||||
DIST chromium_123.0.6312.86-1raptor0~deb12u1.debian.tar.xz 579124 BLAKE2B a27996211fbed198480e50934e39b0eda4c39e5e78a03f9b290cb90a6c8d7003b6aa828bf35e6744e9d7aa9a922f43baa77d6c9768140baf5749a797c2dad664 SHA512 cfb51fd910f3330100a2dc9ea993d537f126329ff2c590744954a3bfbb712d7bf1d7ad9066628aba5d28c98f2f9b069cf02f8c6048d2ad0a1a376468bdbd9196
|
||||
DIST chromium_124.0.6367.118-1raptor0~deb12u1.debian.tar.xz 582728 BLAKE2B ee5fe2b0bbe5d3e5edcee07fbde0934a6c219f95c4e057b7a7ea01f2579b6d87e1c7f07090e98a13eeaa79b19a563d1b12f1ae49687872527d7b55b33a8eaf51 SHA512 800f409d8d14af957218159e73e7ecdde1f5c59221c3d8693cf6be0e811b682e78541ac490bd7f1c5c6820e74c6c690817635e45465675c9906fff55d1319f9f
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -68,7 +68,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-
|
|||
|
||||
DESCRIPTION="Open-source version of Google Chrome web browser"
|
||||
HOMEPAGE="https://www.chromium.org/"
|
||||
PATCHSET_PPC64="123.0.6312.105-1raptor0~deb12u1"
|
||||
PATCHSET_PPC64="124.0.6367.118-1raptor0~deb12u1"
|
||||
PATCH_V="${PV%%\.*}"
|
||||
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
|
||||
system-toolchain? (
|
||||
|
|
@ -87,8 +87,8 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
|
|||
pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/beta"
|
||||
KEYWORDS="~arm64"
|
||||
SLOT="0/stable"
|
||||
KEYWORDS="arm64"
|
||||
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
|
||||
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
|
||||
IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
|
||||
|
|
@ -250,8 +250,8 @@ BDEPEND="
|
|||
>=virtual/rust-${RUST_MIN_VER}[profiler(-)]
|
||||
)
|
||||
>=dev-build/gn-${GN_MIN_VER}
|
||||
dev-build/ninja
|
||||
dev-lang/perl
|
||||
>=dev-build/ninja-1.7.2
|
||||
>=dev-util/gperf-3.0.3
|
||||
dev-vcs/git
|
||||
>=net-libs/nodejs-7.6.0[inspector]
|
||||
|
|
@ -336,7 +336,7 @@ pre_build_checks() {
|
|||
# Check build requirements: bugs #471810, #541816, #914220
|
||||
# We're going to start doing maths here on the size of an unpacked source tarball,
|
||||
# this should make updates easier as chromium continues to balloon in size.
|
||||
local BASE_DISK=18
|
||||
local BASE_DISK=22
|
||||
local EXTRA_DISK=1
|
||||
local CHECKREQS_MEMORY="4G"
|
||||
tc-is-cross-compiler && EXTRA_DISK=2
|
||||
|
|
@ -428,6 +428,7 @@ src_prepare() {
|
|||
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
|
||||
"${FILESDIR}/chromium-117-system-zstd.patch"
|
||||
"${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
|
||||
"${FILESDIR}/chromium-125-ninja-1-12.patch"
|
||||
)
|
||||
|
||||
if use widevine; then
|
||||
|
|
@ -461,7 +462,6 @@ src_prepare() {
|
|||
done
|
||||
PATCHES+=( "${WORKDIR}/ppc64le" )
|
||||
PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
|
||||
PATCHES+=( "${WORKDIR}/debian/patches/fixes/blink-fonts-shape-result.patch" )
|
||||
fi
|
||||
|
||||
default
|
||||
|
|
@ -36,15 +36,15 @@ PYTHON_REQ_USE="xml(+)"
|
|||
|
||||
# These variables let us easily bound supported major dependency versions in one place.
|
||||
GCC_MIN_VER=12
|
||||
GN_MIN_VER=0.2154
|
||||
GN_MIN_VER=0.2165
|
||||
# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease
|
||||
# ebuilds; try to keep this up to date with the latest version in the tree.
|
||||
LLVM_MAX_SLOT=19
|
||||
LLVM_MIN_SLOT=17
|
||||
RUST_MIN_VER=1.72.0
|
||||
# chromium-tools/get-chromium-toolchain-strings.sh
|
||||
GOOGLE_CLANG_VER=llvmorg-19-init-2319-g7c4c2746-1
|
||||
GOOGLE_RUST_VER=340bb19fea20fd5f9357bbfac542fad84fc7ea2b-3
|
||||
GOOGLE_CLANG_VER=llvmorg-19-init-8091-gab037c4f-1
|
||||
GOOGLE_RUST_VER=ab71ee7a9214c2793108a41efb065aa77aeb7326-1
|
||||
|
||||
# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC
|
||||
# Resolved upstream, requires testing and some backporting I'm sure
|
||||
|
|
@ -64,7 +64,7 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu
|
|||
sv sw ta te th tr uk ur vi zh-CN zh-TW"
|
||||
|
||||
inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
|
||||
inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
|
||||
inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
|
||||
|
||||
DESCRIPTION="Open-source version of Google Chrome web browser"
|
||||
HOMEPAGE="https://www.chromium.org/"
|
||||
|
|
@ -87,10 +87,10 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
|
|||
pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/stable"
|
||||
SLOT="0/beta"
|
||||
KEYWORDS="~arm64"
|
||||
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
|
||||
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
|
||||
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
|
||||
IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
|
||||
RESTRICT="!bindist? ( bindist )"
|
||||
|
||||
|
|
@ -250,8 +250,8 @@ BDEPEND="
|
|||
>=virtual/rust-${RUST_MIN_VER}[profiler(-)]
|
||||
)
|
||||
>=dev-build/gn-${GN_MIN_VER}
|
||||
dev-build/ninja
|
||||
dev-lang/perl
|
||||
>=dev-build/ninja-1.7.2
|
||||
>=dev-util/gperf-3.0.3
|
||||
dev-vcs/git
|
||||
>=net-libs/nodejs-7.6.0[inspector]
|
||||
|
|
@ -336,7 +336,7 @@ pre_build_checks() {
|
|||
# Check build requirements: bugs #471810, #541816, #914220
|
||||
# We're going to start doing maths here on the size of an unpacked source tarball,
|
||||
# this should make updates easier as chromium continues to balloon in size.
|
||||
local BASE_DISK=18
|
||||
local BASE_DISK=22
|
||||
local EXTRA_DISK=1
|
||||
local CHECKREQS_MEMORY="4G"
|
||||
tc-is-cross-compiler && EXTRA_DISK=2
|
||||
|
|
@ -423,12 +423,12 @@ src_prepare() {
|
|||
|
||||
local PATCHES=(
|
||||
"${FILESDIR}/chromium-cross-compile.patch"
|
||||
"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
|
||||
"${FILESDIR}/chromium-109-system-zlib.patch"
|
||||
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
|
||||
"${FILESDIR}/chromium-117-system-zstd.patch"
|
||||
"${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
|
||||
"${FILESDIR}/chromium-123-qt-gui-check.patch"
|
||||
"${FILESDIR}/chromium-125-oauth2-client-switches.patch"
|
||||
"${FILESDIR}/chromium-125-system-zstd.patch"
|
||||
"${FILESDIR}/chromium-125-ninja-1-12.patch"
|
||||
)
|
||||
|
||||
if use widevine; then
|
||||
|
|
@ -462,7 +462,6 @@ src_prepare() {
|
|||
done
|
||||
PATCHES+=( "${WORKDIR}/ppc64le" )
|
||||
PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
|
||||
PATCHES+=( "${WORKDIR}/debian/patches/fixes/blink-fonts-shape-result.patch" )
|
||||
fi
|
||||
|
||||
default
|
||||
|
|
@ -557,7 +556,6 @@ src_prepare() {
|
|||
third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
|
||||
third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
|
||||
third_party/devtools-frontend/src/front_end/third_party/wasmparser
|
||||
third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
|
||||
third_party/devtools-frontend/src/third_party
|
||||
third_party/distributed_point_functions
|
||||
third_party/dom_distiller_js
|
||||
|
|
@ -589,6 +587,7 @@ src_prepare() {
|
|||
third_party/jsoncpp
|
||||
third_party/jstemplate
|
||||
third_party/khronos
|
||||
third_party/lens_server_proto
|
||||
third_party/leveldatabase
|
||||
third_party/libaddressinput
|
||||
third_party/libaom
|
||||
|
|
@ -639,7 +638,6 @@ src_prepare() {
|
|||
third_party/ots
|
||||
third_party/pdfium
|
||||
third_party/pdfium/third_party/agg23
|
||||
third_party/pdfium/third_party/base
|
||||
third_party/pdfium/third_party/bigint
|
||||
third_party/pdfium/third_party/freetype
|
||||
third_party/pdfium/third_party/lcms
|
||||
|
|
@ -685,6 +683,7 @@ src_prepare() {
|
|||
third_party/tflite/src/third_party/eigen3
|
||||
third_party/tflite/src/third_party/fft2d
|
||||
third_party/tflite/src/third_party/xla/third_party/tsl
|
||||
third_party/tflite/src/third_party/xla/xla/tsl/util
|
||||
third_party/ruy
|
||||
third_party/six
|
||||
third_party/ukey2
|
||||
|
|
@ -819,6 +818,12 @@ chromium_configure() {
|
|||
|
||||
if tc-is-clang; then
|
||||
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
|
||||
# Workaround for build failure with clang-18 and -march=native without
|
||||
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
|
||||
use amd64 && is-flagq -march=native &&
|
||||
[[ $(clang-major-version) -ge 18 ]] &&
|
||||
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
|
||||
append-flags -mevex512
|
||||
else
|
||||
myconf_gn+=" is_clang=false"
|
||||
fi
|
||||
|
|
@ -1441,4 +1446,12 @@ pkg_postinst() {
|
|||
elog "/etc/chromium/default."
|
||||
fi
|
||||
fi
|
||||
|
||||
if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
|
||||
ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
|
||||
ewarn "indicates that the Gentoo handbook was not followed to completion."
|
||||
ewarn ""
|
||||
ewarn "Chromium is known to behave unpredictably with this system configuration;"
|
||||
ewarn "please complete the configuration of this system before logging any bugs."
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
diff --git a/components/media_router/common/providers/cast/channel/enum_table.h b/components/media_router/common/providers/cast/channel/enum_table.h
|
||||
index 842553a..89de703 100644
|
||||
--- a/components/media_router/common/providers/cast/channel/enum_table.h
|
||||
+++ b/components/media_router/common/providers/cast/channel/enum_table.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <ostream>
|
||||
+#include <vector>
|
||||
|
||||
#include "base/check_op.h"
|
||||
#include "base/notreached.h"
|
||||
@@ -187,7 +188,6 @@ class
|
||||
inline constexpr GenericEnumTableEntry(int32_t value);
|
||||
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
|
||||
|
||||
- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
|
||||
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
|
||||
|
||||
private:
|
||||
@@ -253,7 +253,6 @@ class EnumTable {
|
||||
constexpr Entry(E value, base::StringPiece str)
|
||||
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
|
||||
|
||||
- Entry(const Entry&) = delete;
|
||||
Entry& operator=(const Entry&) = delete;
|
||||
};
|
||||
|
||||
@@ -312,15 +311,14 @@ class EnumTable {
|
||||
if (is_sorted_) {
|
||||
const std::size_t index = static_cast<std::size_t>(value);
|
||||
if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
|
||||
- const auto& entry = data_.begin()[index];
|
||||
+ const auto& entry = data_[index];
|
||||
if (ANALYZER_ASSUME_TRUE(entry.has_str()))
|
||||
return entry.str();
|
||||
}
|
||||
return absl::nullopt;
|
||||
}
|
||||
return GenericEnumTableEntry::FindByValue(
|
||||
- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
|
||||
- data_.size(), static_cast<int32_t>(value));
|
||||
+ &data_[0], data_.size(), static_cast<int32_t>(value));
|
||||
}
|
||||
|
||||
// This overload of GetString is designed for cases where the argument is a
|
||||
@@ -348,8 +346,7 @@ class EnumTable {
|
||||
// enum value directly.
|
||||
absl::optional<E> GetEnum(base::StringPiece str) const {
|
||||
auto* entry = GenericEnumTableEntry::FindByString(
|
||||
- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
|
||||
- data_.size(), str);
|
||||
+ &data_[0], data_.size(), str);
|
||||
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
|
||||
}
|
||||
|
||||
@@ -364,7 +361,7 @@ class EnumTable {
|
||||
// Align the data on a cache line boundary.
|
||||
alignas(64)
|
||||
#endif
|
||||
- std::initializer_list<Entry> data_;
|
||||
+ const std::vector<Entry> data_;
|
||||
bool is_sorted_;
|
||||
|
||||
constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
|
||||
@@ -376,8 +373,8 @@ class EnumTable {
|
||||
|
||||
for (std::size_t i = 0; i < data.size(); i++) {
|
||||
for (std::size_t j = i + 1; j < data.size(); j++) {
|
||||
- const Entry& ei = data.begin()[i];
|
||||
- const Entry& ej = data.begin()[j];
|
||||
+ const Entry& ei = data[i];
|
||||
+ const Entry& ej = data[j];
|
||||
DCHECK(ei.value != ej.value)
|
||||
<< "Found duplicate enum values at indices " << i << " and " << j;
|
||||
DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
https://bugs.gentoo.org/917645
|
||||
(copied patch from qtwebengine:6 - https://bugs.gentoo.org/917633)
|
||||
|
||||
Quick fix for a static_assert failure with icu74. Still waiting
|
||||
for a proper upstream fix and unknown if entirely right, but is
|
||||
an extension of [1] (is now 48 rather than 43).
|
||||
|
||||
[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
|
||||
--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
|
||||
+++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
|
||||
@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
-#if U_ICU_VERSION_MAJOR_NUM >= 58
|
||||
+#if U_ICU_VERSION_MAJOR_NUM >= 74
|
||||
+#define BA_LB_COUNT (U_LB_COUNT - 8)
|
||||
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
|
||||
#define BA_LB_COUNT (U_LB_COUNT - 3)
|
||||
#else
|
||||
#define BA_LB_COUNT U_LB_COUNT
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 3a812de6e7e0b285eda21ebbb670ca809c4db2b5 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
||||
Date: Thu, 11 Apr 2024 12:42:17 +1000
|
||||
Subject: [PATCH] Add QtGui to the list of Qt modules
|
||||
|
||||
Re: https://bugreports.qt.io/browse/QTBUG-124135 - certain versions of QT
|
||||
(6.6.3, 6.7.0) produce pkg-config files that no longer emit dependencies.
|
||||
This causes Chromium builds to fail as due to not seeing QtGui as a dependency
|
||||
of QtWidgets:
|
||||
|
||||
`gen/qt6/../../../../ui/qt/qt_shim.h:11:10: fatal error: 'QImage' file not found`
|
||||
|
||||
While this has been resolved upstream, there will certainly be some users
|
||||
that are still using these versions of QT. This patch adds QtGui to the list of
|
||||
Qt modules that are required to build the Chromium UI.
|
||||
|
||||
Bug: https://bugs.gentoo.org/928299
|
||||
Suggested-by: Chris Pritchard <chris@christopherpritchard.co.uk>
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
--- a/ui/qt/BUILD.gn
|
||||
+++ b/ui/qt/BUILD.gn
|
||||
@@ -60,6 +60,7 @@ template("qt_shim") {
|
||||
pkg_config("qt" + invoker.qt_version + "_config") {
|
||||
packages = [
|
||||
"Qt" + invoker.qt_version + "Core",
|
||||
+ "Qt" + invoker.qt_version + "Gui",
|
||||
"Qt" + invoker.qt_version + "Widgets",
|
||||
]
|
||||
}
|
||||
--
|
||||
2.44.0
|
||||
17
www-client/chromium/files/chromium-125-ninja-1-12.patch
Normal file
17
www-client/chromium/files/chromium-125-ninja-1-12.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
https://chromium-review.googlesource.com/c/chromium/src/+/5487538
|
||||
commit a976cb05b4024b7a6452d1541378d718cdfe33e6
|
||||
Author: Takuto Ikuta <tikuta@chromium.org>
|
||||
Date: Thu Apr 25 07:25:32 2024
|
||||
|
||||
[devtools] fix a missing build dependency to a generated file
|
||||
|
||||
--- a/chrome/browser/devtools/BUILD.gn
|
||||
+++ b/chrome/browser/devtools/BUILD.gn
|
||||
@@ -117,6 +117,7 @@
|
||||
"//chrome/browser/autofill:autofill",
|
||||
"//components/autofill/content/browser:browser",
|
||||
"//components/autofill/core/browser:browser",
|
||||
+ "//components/enterprise/buildflags",
|
||||
"//components/paint_preview/buildflags:buildflags",
|
||||
"//components/variations/service:service",
|
||||
"//components/webapps/common:common",
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 6a84205d0399a94e8b526176a7dcafd6c2051a95 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
||||
Date: Thu, 18 Apr 2024 21:15:20 +1000
|
||||
Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
|
||||
125 update
|
||||
|
||||
125 moved the content to a new file.
|
||||
|
||||
Google doesn't let us bake in OAuth2 credentials, and for some time,
|
||||
Google sign-in has been broken. Arch dealt with this in March, and so
|
||||
did we to some degree, but in the last few months, our sign-in
|
||||
credentials have been broken. It appears that we actually did remove API
|
||||
credentials in March around Chrome 89, but they got added back, perhaps
|
||||
when rotating newer versions to replace older versions. Work around this
|
||||
by following Arch's lead: we remove the predefined credentials, as
|
||||
before, but also we patch Chromium so that people can use their own
|
||||
easily, using Arch's patch for that.
|
||||
|
||||
For more info, see:
|
||||
|
||||
https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
|
||||
https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
|
||||
https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
|
||||
|
||||
Bug: https://bugs.gentoo.org/791871
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
--- a/google_apis/google_api_keys-inc.cc
|
||||
+++ b/google_apis/google_api_keys-inc.cc
|
||||
@@ -182,11 +182,11 @@ class APIKeyCache {
|
||||
|
||||
std::string default_client_id = CalculateKeyValue(
|
||||
GOOGLE_DEFAULT_CLIENT_ID,
|
||||
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
|
||||
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
|
||||
std::string(), environment.get(), command_line, gaia_config);
|
||||
std::string default_client_secret = CalculateKeyValue(
|
||||
GOOGLE_DEFAULT_CLIENT_SECRET,
|
||||
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
|
||||
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
|
||||
std::string(), environment.get(), command_line, gaia_config);
|
||||
|
||||
// We currently only allow overriding the baked-in values for the
|
||||
--
|
||||
2.44.0
|
||||
|
||||
53
www-client/chromium/files/chromium-125-system-zstd.patch
Normal file
53
www-client/chromium/files/chromium-125-system-zstd.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
From 4ac5e29c999c7bbcb8409a2008b0061e1ae365dd Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
||||
Date: Thu, 18 Apr 2024 21:54:54 +1000
|
||||
Subject: [PATCH] Zstd now needs compress, too
|
||||
|
||||
Existing patch updated for 125, added source_set("compress")
|
||||
|
||||
--- a/build/linux/unbundle/replace_gn_files.py
|
||||
+++ b/build/linux/unbundle/replace_gn_files.py
|
||||
@@ -80,6 +80,7 @@ REPLACEMENTS = {
|
||||
'vulkan_memory_allocator' : 'third_party/vulkan_memory_allocator/BUILD.gn',
|
||||
'woff2': 'third_party/woff2/BUILD.gn',
|
||||
'zlib': 'third_party/zlib/BUILD.gn',
|
||||
+ 'zstd': 'third_party/zstd/BUILD.gn',
|
||||
}
|
||||
|
||||
|
||||
--- /dev/null
|
||||
+++ b/build/linux/unbundle/zstd.gn
|
||||
@@ -0,0 +1,30 @@
|
||||
+import("//build/config/linux/pkg_config.gni")
|
||||
+import("//build/shim_headers.gni")
|
||||
+
|
||||
+pkg_config("system_zstd") {
|
||||
+ packages = [ "libzstd" ]
|
||||
+}
|
||||
+
|
||||
+shim_headers("zstd_shim") {
|
||||
+ root_path = "src/lib"
|
||||
+ headers = [
|
||||
+ "zdict.h",
|
||||
+ "zstd.h",
|
||||
+ "zstd_errors.h",
|
||||
+ ]
|
||||
+}
|
||||
+
|
||||
+source_set("zstd") {
|
||||
+ deps = [ ":zstd_shim" ]
|
||||
+ public_configs = [ ":system_zstd" ]
|
||||
+}
|
||||
+
|
||||
+source_set("compress") {
|
||||
+ deps = [ ":zstd_shim" ]
|
||||
+ public_configs = [ ":system_zstd" ]
|
||||
+}
|
||||
+
|
||||
+source_set("decompress") {
|
||||
+ deps = [ ":zstd_shim" ]
|
||||
+ public_configs = [ ":system_zstd" ]
|
||||
+}
|
||||
--
|
||||
2.44.0
|
||||
|
||||
Loading…
Add table
Reference in a new issue