diff options
| -rw-r--r-- | www-client/chromium/Manifest | 8 | ||||
| -rw-r--r-- | www-client/chromium/chromium-112.0.5596.2.ebuild (renamed from www-client/chromium/chromium-111.0.5563.8.ebuild) | 4 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-112-compiler.patch | 244 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-112-disable-global-media-controls.patch | 13 |
4 files changed, 263 insertions, 6 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 78b5664..5477779 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -5,6 +5,8 @@ AUX chromium-109-compiler-r1.patch 8478 BLAKE2B 7fa1d12a766df4bbe571c2d58bade5e7 AUX chromium-109-minizip.patch 6865 BLAKE2B e7b73fa960b695b352d81f1e3cda8ad11d8a9d55633747ac5f2e848c94d66b7b504dd9967c51feee62c1c4bd2316c4e4aa6028ebdba446b57bfd81abd3989214 SHA512 bf8f7df347d94c7782ab2f7764010ad0f134e184cfaa21488ee11b2392697c3a83a0fbd801454dc773232c5ddb263e7564c149b66f110580ebd66305ff02dbe7 AUX chromium-110-compiler.patch 8430 BLAKE2B ebe41752ca1b258ac4106fb6a28bc061b93fe7bbc6d86ce454dd16ca8a9986737d31ff46d3e0b633d93db235426edf471077b4436d33be122723ad63d3df8023 SHA512 9f7cd4c8b6be84c849e0fc63e839863058043e892071c70ee344bf8db208c6e517d1272e2cfb9fa6a0cb373380e53ceed486c42a2051917d2fd3ee5ceaa4bc19 AUX chromium-111-InkDropHost-crash.patch 1114 BLAKE2B 2481e068e77f28c2ec0cfbb55641462e7a3f81e8ae719fe797a44a9385898afbbedb129a5138f54fc46b4b0f533a1c6cc43ac76461f6aebeb670ff8e195c38d1 SHA512 13ca2958c15c2e9a571cff588cabb6756e14180136f670112f6e406a3cb7f8661e78fa053e821f4a3f48944f024d580ddcb14e4be84a129b873e637650cb360f +AUX chromium-112-compiler.patch 8458 BLAKE2B a8da8236ad970067c41c385549cb304898a0e1e127ae98889091f1b9eb3a828665f9950f212fcb3d0c96007557770b9432677cbfcec26097b28ab8671cc3d3dd SHA512 6b3276c906c668b1f5ce89a2d6c5173225daed3b4fd096fbce72d587eaecc4feecb7d7d710372e766ba824dc526ca6f712c29a9e317892ca10126a7cba60d87f +AUX chromium-112-disable-global-media-controls.patch 611 BLAKE2B 36ec28102e447ec525f0f7051c09b27720e51e560b9b43c2ccce7355a9c7e18f73c0f1eb1ee4112b8fe936e9d88933f19c8e1579eeea793a6e3eadecd31baa68 SHA512 1b866d8894e82ed39e6b9282a57f859ff9b80027fda38f8c79cdaed833fdb21b8e5ff641db18fed1c5bdbd52af61d262a13233e4f4a346e7038c96ccfd71b8e6 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6 @@ -16,8 +18,6 @@ AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 DIST chromium-110.0.5478.4.tar.xz 1702030384 BLAKE2B 8786705ca668056d36a899887731c34b6eda60916741263c0cc73ca195845ee397f175dbc07bf02b70585c2d824a8d8fcf3ec5999beb69f18b74855f01b2f525 SHA512 a7e525b9c3145596de7f16a59605a59c0a7f8c30172379213cc6aac21ed9a820ce79c166e58e2d17d0262f396541c9bfda1629bcc8baaef0a9e101a48e087f99 -DIST chromium-111.0.5562.0.tar.xz 1740244828 BLAKE2B c3c42258331a4be9667748153f589b9437074cf7b55818a08871e3a3194a8c1926a72c8970e524f7bc6f4d87c48c9b06519084c3fe78526fec01fa20a18ad9c8 SHA512 e54e09771175595111d9eb94326e0ef10c4ea40b41ce461604dfae786564974949979bf99303f0ac6d7ab780ab5e58ec7613d430f8c7f509fa8dcd9a743b4a2d -DIST chromium-111.0.5563.8.tar.xz 1742098256 BLAKE2B 6d59102bf5d762970e896653a9af54d7fe20bac8e48b5a6bd0c083e6e2bf1e8d2e4c74105b40126c39854c367cd36900af40595496d9e98f1004c21f4faaf41d SHA512 dc61cfe2d9d48885931f63f527f9f9e2ad20ed57d60e65b6c496d4138df92dacfbfee29c84b2ebea7b6acc3afe62932dead2ac680bd0a96543b23e9201c394e1 +DIST chromium-112.0.5596.2.tar.xz 1718784936 BLAKE2B ab64af76c9a5b41ec19e32a98170fcb911012316700b225e08fd593ee51d681519e99078f9010a9e3368567a6047776607087b3ae4a6e952bbe5e4c5c49ef681 SHA512 65847b1206bf078d6bc67f597b94bad3219b55c8398bbdac2db01040bc2a37cb1fb2971ceabd8c5c68fd1769a2550c6abcb5c6e726424175af0c5d14eeba16a4 EBUILD chromium-110.0.5478.4.ebuild 32927 BLAKE2B 216a8e78a7d1aa59614d83421dbbd7fc1a7d61be3e3bf4eef72c248765bd3cfca3436a1f7ac8c93e489a36915d38c04ad85b5e2930a7fc2ebba66bb57f99e11c SHA512 6e41f29ce43ebab3ef01fb4c1502e68a1f3ff0ce52e6df274e67ff91f61660122a2a5c0bd0ca0f848cac2a78ef2eea83c6e7299ad8b729ec3f381c5cca94c30a -EBUILD chromium-111.0.5562.0.ebuild 33072 BLAKE2B dda7f0303e770dd4daf5eeb7fcae74cecde727a69529f846eda77813720b1a398d25644b1904a5474e9a86244c7f0ecb496411e8eaea7f4ff97770ef48b3b9cd SHA512 1cb3a935182e1c37157b577012d9dc15a3d8d6d2ccf19474a5839b1a0086fa3651732f146786d0bdd38eca86e3375dbc59ab5e91fd2277262f11effffbf5c731 -EBUILD chromium-111.0.5563.8.ebuild 33072 BLAKE2B dda7f0303e770dd4daf5eeb7fcae74cecde727a69529f846eda77813720b1a398d25644b1904a5474e9a86244c7f0ecb496411e8eaea7f4ff97770ef48b3b9cd SHA512 1cb3a935182e1c37157b577012d9dc15a3d8d6d2ccf19474a5839b1a0086fa3651732f146786d0bdd38eca86e3375dbc59ab5e91fd2277262f11effffbf5c731 +EBUILD chromium-112.0.5596.2.ebuild 33072 BLAKE2B 8f264fc85d580981e3e1022275a3ad46db6851e23c72651ad1942b308d6bff180624c5d282206611f99668799de4afbfefa7591a8f3ffdfebd0d978d74055744 SHA512 543de40dff9390b45bed56299b7e209a8f8045475e73d4243302e763e5a97a16ae7d739ad2dfd0de40c72982feace3da9331d9d274ef9840b3fe52112557547e diff --git a/www-client/chromium/chromium-111.0.5563.8.ebuild b/www-client/chromium/chromium-112.0.5596.2.ebuild index 8647221..1dd38ee 100644 --- a/www-client/chromium/chromium-111.0.5563.8.ebuild +++ b/www-client/chromium/chromium-112.0.5596.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml" CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he @@ -244,7 +244,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch" - "${FILESDIR}/chromium-110-compiler.patch" + "${FILESDIR}/chromium-112-compiler.patch" "${FILESDIR}/chromium-103-VirtualCursor-std-layout.patch" "${FILESDIR}/chromium-109-minizip.patch" diff --git a/www-client/chromium/files/chromium-112-compiler.patch b/www-client/chromium/files/chromium-112-compiler.patch new file mode 100644 index 0000000..fb17a69 --- /dev/null +++ b/www-client/chromium/files/chromium-112-compiler.patch @@ -0,0 +1,244 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index fc668a6a2..96c6f68c0 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -289,9 +289,7 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", + ":rustc_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ":compiler_deterministic", + ] +@@ -542,37 +540,6 @@ config("compiler") { + ldflags += [ "-Wl,-z,keep-text-section-prefix" ] + } + +- if (is_clang && !is_nacl && current_os != "zos") { +- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] +- if (save_reproducers_on_lld_crash && use_lld) { +- ldflags += [ +- "-fcrash-diagnostics=all", +- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir, +- ] +- } +- +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- cflags += [ +- "-mllvm", +- "-instcombine-lower-dbg-declare=0", +- ] +- if (!is_debug && use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ] +- } +- } +- +- # TODO(crbug.com/1235145): Investigate why/if this should be needed. +- if (is_win) { +- cflags += [ "/clang:-ffp-contract=off" ] +- } else { +- cflags += [ "-ffp-contract=off" ] +- } +- } +- + # Rust compiler setup (for either clang or rustc). + if (enable_rust) { + defines += [ "RUST_ENABLED" ] +@@ -1352,46 +1319,6 @@ config("compiler_deterministic") { + } + } + +- # Makes builds independent of absolute file path. +- if (is_clang && strip_absolute_paths_from_debug_symbols) { +- # If debug option is given, clang includes $cwd in debug info by default. +- # For such build, this flag generates reproducible obj files even we use +- # different build directory like "out/feature_a" and "out/feature_b" if +- # we build same files with same compile flag. +- # Other paths are already given in relative, no need to normalize them. +- if (is_nacl) { +- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] +- } else { +- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= +- # and -fcoverage-compilation-dir=. +- cflags += [ "-ffile-compilation-dir=." ] +- swiftflags += [ "-file-compilation-dir=." ] +- } +- if (!is_win) { +- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) +- asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +- } +- +- if (is_win && use_lld) { +- if (symbol_level == 2 || (is_clang && using_sanitizer)) { +- # Absolutize source file paths for PDB. Pass the real build directory +- # if the pdb contains source-level debug information and if linker +- # reproducibility is not critical. +- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ] +- } else { +- # Use a fake fixed base directory for paths in the pdb to make the pdb +- # output fully deterministic and independent of the build directory. +- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ] +- } +- } +- } +- + # Tells the compiler not to use absolute paths when passing the default + # paths to the tools it invokes. We don't want this because we don't + # really need it and it can mess up the goma cache entries. +@@ -1410,26 +1337,7 @@ config("compiler_deterministic") { + } + } + +-config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path) { +- update_args = [ +- "--print-revision", +- "--verify-version=$clang_version", +- ] +- if (llvm_force_head_revision) { +- update_args += [ "--llvm-force-head-revision" ] +- } +- clang_revision = exec_script("//tools/clang/scripts/update.py", +- update_args, +- "trim string") +- +- # This is here so that all files get recompiled after a clang roll and +- # when turning clang on or off. (defines are passed via the command line, +- # and build system rebuild things when their commandline changes). Nothing +- # should ever read this define. +- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] +- } +-} ++config("clang_revision") { } + + config("rustc_revision") { + # Use the rustc version as an input to all rustc invovations if a custom +@@ -1732,7 +1640,7 @@ config("chromium_code") { + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] ++ cflags = [ ] + if (treat_warnings_as_errors) { + cflags += [ "-Werror" ] + +@@ -1741,10 +1649,6 @@ config("chromium_code") { + # well. + ldflags = [ "-Werror" ] + } +- if (is_clang) { +- # Enable extra warnings for chromium_code when we control the compiler. +- cflags += [ "-Wextra" ] +- } + + # In Chromium code, we define __STDC_foo_MACROS in order to get the + # C99 macros on Mac and Linux. +@@ -1753,16 +1657,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && +- current_cpu != "s390" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64" && +- current_cpu != "riscv64" && current_cpu != "loong64") { +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- defines += [ "_FORTIFY_SOURCE=2" ] +- } +- + if (is_mac) { + cflags_objc = [ "-Wobjc-missing-property-synthesis" ] + cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] +@@ -2127,7 +2021,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + if (chrome_pgo_phase != 2) { + # Favor size over speed, /O1 must be before the common flags. +@@ -2186,7 +2081,8 @@ config("optimize") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2226,7 +2122,8 @@ config("no_optimize") { + # Turns up the optimization level. On Windows, this implies whole program + # optimization and link-time code generation which is very expensive and should + # be used sparingly. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2259,7 +2156,8 @@ config("optimize_max") { + # + # TODO(crbug.com/621335) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2285,7 +2183,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + rustflags = [ "-Copt-level=1" ] + ldflags = common_optimize_on_ldflags +@@ -2408,7 +2307,8 @@ config("win_pdbaltpath") { + } + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (is_clang) { + cflags = [ +@@ -2548,7 +2448,8 @@ config("symbols") { + # Minimal symbols. + # This config guarantees to hold symbol for stack trace which are shown to user + # when crash happens in unittests running on buildbot. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + if (is_win) { + # Functions, files, and line tables only. + cflags = [] +@@ -2622,7 +2523,8 @@ config("minimal_symbols") { + # This configuration contains function names only. That is, the compiler is + # told to not generate debug information and the linker then just puts function + # names in the final debug information. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (is_win) { + ldflags = [ "/DEBUG" ] + diff --git a/www-client/chromium/files/chromium-112-disable-global-media-controls.patch b/www-client/chromium/files/chromium-112-disable-global-media-controls.patch new file mode 100644 index 0000000..ed14e68 --- /dev/null +++ b/www-client/chromium/files/chromium-112-disable-global-media-controls.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc +index b4cc0b786..661473e3e 100644 +--- a/chrome/browser/media/router/media_router_feature.cc ++++ b/chrome/browser/media/router/media_router_feature.cc +@@ -62,7 +62,7 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, + #else + BASE_FEATURE(kGlobalMediaControlsCastStartStop, + "GlobalMediaControlsCastStartStop", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS) + + #endif // BUILDFLAG(IS_ANDROID) |