diff options
| author |  Chris Xiong <chirs241097@gmail.com>
| 2022-02-10 12:00:03 -0500 |
|---|---|---|
| committer | Chris Xiong <chirs241097@gmail.com>
| 2022-02-10 12:00:03 -0500 |
| commit | 5166c63e9da7ebf371b7faf0afc672ce494408f7 (patch) | |
| tree | 0279812266c9e2d0af1d5a2dc970c739b242566b /www-client | |
| parent | ccfd5019f8f2ba0d08298592baf8e765ca46079c (diff) | |
| download | ppo-5166c63e9da7ebf371b7faf0afc672ce494408f7.tar.xz | |
chromium 100 maybe?
Diffstat (limited to 'www-client')
6 files changed, 1302 insertions, 0 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0afb57c..23b662a 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,7 @@ +AUX chromium-100-ByteSwapUintPtrT-constexpr.patch 1876 BLAKE2B 6fdd58a370bab0c187e996cc36b7f664b4be9bdbb510956eafed24086b4aed2a3639084c08094a2b9e53b7b854d6b37780977ce343ed7fb21ce3434df8db4c38 SHA512 35b71ea576014e0ccca416bae6b307bf3eb3114d3592647eb95544b22fb89556be96e89638ffde7faa1b5d53b26ae1c15bf22cc4386afb71add795b3f6c01e4b +AUX chromium-100-LayoutUnit-constexpr.patch 1300 BLAKE2B e466d5e80bcc971dd31d9f4f61de7c5c0587fffc23b1b3f883dfc61d1a71c637ebf67b7539c1c2a6bab8c93daf21c57f491e1bc56bc5f28d9be12ad19f37615b SHA512 df8a805f9f50fb51378afdbcd9a1d8d94909b1060d086e88a594a686eaadce7744b2fd7b00e2c60a2c334005adef5344f872e029b2b3b0af8a181f39aea262d9 +AUX chromium-100-PartitionFreelistEntry-namespace.patch 1064 BLAKE2B 292c339dcf2f898fb9f74d11a6eea1d7a1c14737e20c84abca5199d7f167904f5e498c2527730e15e79ed3933323019857ed68a796563231cec1ac30b0f04a8d SHA512 129ea3f88d1a693bdb0f51c668a66b3bd08041af602a1073ac97e806bd2a8db7283ae9f9a6b1b638b71047c68b220780b35c558c67bab55ae3d552d78e4f5a21 +AUX chromium-100-compiler.patch 7540 BLAKE2B 6eb402c14f1c7018a73f90cabea6cfb5eb8fb5b79fa22ab81c9dbd769160061c4655f1c76e197d8f1af35eb5ad394e9a46015348a1e75bdb687b40fa564f8548 SHA512 9ee5e32e8e90c4a124195fdf9b87a6409e180ddf1bcde249efe058b83fc031a86c7df1f6883faca997ee26f55300c9225bde1bf0cbdd2e55d89abe11cbf27854 AUX chromium-71-gcc-0.patch 2531 BLAKE2B 141886b7e9c6b627ba562d33729b60bc8b9cefd7792175e542527cb97c16a772f8b7a868fb3bdef8d2e89bec5e991b88a5fb074afc7dd2467de20cc6acdeeb47 SHA512 1c9875c087776b1675049bdfb132b55ea74a6015ebbbcfa9be412017bc877469ddde35ddb775338d8598fcc045de7e3c6c39d5b8a1d59c82447eb4bf5214b2bc AUX chromium-73-gcc-0.patch 4483 BLAKE2B b0759cf95146f483bf246c20d3c62956f6ddb5138c9436f9bf823956eaaab06de150eb90ec1d535d86965077a1d0e051e81d00a49d8674b836085d8a69f75570 SHA512 de7101ba00d8c1f00cd3f557574653cb9df80e59efe869c4fb127736b0f0793b20157169af74c8e38057c460e29a7e90e05274c749dbb6a30aa0aa7886b74b36 AUX chromium-73-gcc-1.patch 4194 BLAKE2B 23d94aad7e77fae0d11b44d3e4cbc1af7e01f62cf2991b6a625d65ba8fc53a2ef369e55e2308739a89a1d68df09f99f8382d5bccab798074b206728c7f666b1d SHA512 802ac452eece4b64757990315bb5c38d7cb2ab9f4916b0c5457d9f04a47729e81b3b1dc52c68c641f5cbc20e45a509e721c211d42abfc22ebb0c48af421ec688 @@ -266,6 +270,7 @@ AUX chromium-wpt-gn-78.patch 503 BLAKE2B 1d3aad8a4781b5e43e1eb59dd1b2fdff28a920d AUX chromium-zlib-78.patch 408 BLAKE2B b623e5ce39b53718779bb0418ac6af4f90c05e8f8e65c9018dd8c8ac8176494d07943969fb39ab32cc1b3843398d9557d071c590df3c5a4b284b9e5087ebcef1 SHA512 ed73488dc7cb0cc4afc4b30d619a6b5302edd5acae46bb20175e02469fc6248f7cbd052b4dfacd6d5dfb7bed215b5ac28c9c8a82a64c6ca7e6670059937bad69 AUX chromium-zlib-82.patch 398 BLAKE2B a7e4f98bbd0c19765b819dc322b14eb1abdc94ebdbec2f14fa0e19a8601125f347edd8e8275ff98328791657ef4968bc97a8321ba2ce64968ce26092ac11d08c SHA512 138001d8b638e12e9649be41058bcc71d7ae291423adcea6f074c977ac6868489b5108ed7fe689dee61619bbf07934cff58d7a65d303b80babaf31876981ad0d AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 +DIST chromium-100.0.4867.0.tar.xz 1329672804 BLAKE2B d7147de4bc234caac7578b859a25dd57b9ad996948e850d8e492da6dcec5c42eacd03fcf12fd0ce67e01a6f9842f993c4c0624b5cebbcd0b530f3c85ca5e67b4 SHA512 655f29e85ce20e40b738523524eeb2ba571dcfda3b8c1c42b992c7ae2b0556d5fc10c2f268fe261b9c19ce728979bcff142a65421db6fdb8aac0ae1b80c02a2e DIST chromium-73.0.3683.10.tar.xz 710000528 BLAKE2B f9b3d9387f47a2a07d9b4876d032a9c7f6be5c381028cefe7c2d70d59df0ad732049bdc05a1b1242b3699b3fcb9696368e835607da9c980c96cb11c10605c0ca SHA512 b034b04c8ed402a590a5140a642864698fcd8a42b9da401cd72e44e755d6e949d388bc9b609dee6d3f61f4cc0a896e1fef60f9c7cde2998b1e2b546be48f053e DIST chromium-74.0.3702.0.tar.xz 709828348 BLAKE2B e59a1d591299f38f92c94a13088ab2eb79814b0458e6391d6979d1d5c370c88453799d8a90bff2dc9fd94d1ba3f7330fe713d4eca45f09a953d1ac201b7f2f6e SHA512 fc063bc89a48b0301c4f4e6c7eec6199ded9980b20712c22f320e01947d40b3b7776149b21caa16df5dfa37aa160ad12377347c2573fb693c93f891fb70009fd DIST chromium-75.0.3745.4.tar.xz 749282112 BLAKE2B a6f231c1fcbb2063356222d8698ec97a369a949a01015de9e40fc3423da7800580bd4d52ddd5622bbad8f764c90cf530c48db5b29cca02ec33937945e5477e1f SHA512 2f1cc85bc8f7d07ae5e6e4a96e7087a666e7dd8342ddec9dd2e4cf70d5f989a951a5e0a6fcedd0f18060e57325b5f15afb2b19887f3b04eccfd6523026d76db2 @@ -316,6 +321,7 @@ DIST chromium-98.0.4710.4.tar.xz 1222819976 BLAKE2B 1af16bcecf4be8f53b4c8f41c9fc DIST chromium-98.0.4750.0.tar.xz 1230864580 BLAKE2B b8b5d05bf15a9429f3f5fa851415d21f6e757a99fce9ac47bdeb7f534f9eefc77d13c5f8ba93bfa140bdb536c13e1b6141ac4d7e0f17b742039c403044789c56 SHA512 7f8cc349aa50af0d149ba08e5ed60171e94943bbd52cb0f820f3c7d56749d9e2fd6d71761262ac012cfcad1f7e4f63c0404f39f044df531e776ae6fce951544f DIST chromium-99.0.4818.0.tar.xz 1313012452 BLAKE2B 6c31f15049295046e9c0ea12c6ed8fcd614548e724960c68c1fdee16828a4cdbd189c07b6da9cd59903897f6cbd206acbb1f9f6441ab77180c29fb4fb40f788b SHA512 3a96a9c8529cb6b01f9d765418d71cc5eac1c318ebcc50200e066ed3f44ec0dbfb6b43b313e5fcf5e78ab84304ea663ae162b7870538eeb38922ab53b83bd33b DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf +EBUILD chromium-100.0.4867.0.ebuild 30645 BLAKE2B a0157a3de7b400755a428b5bb12abe4af6ca50f97674fd6659f2619127eab8faa41f0d6a3a318dcc01da125079b8223d3a42a2a8e5ccd589b0e63451fa64b9e2 SHA512 65be9207ee9456e01792b05f969a97e0a1f8dbcbdaa5f7d83bd66fb2cba740e39a8e3ba5693b0fd610f74535872d59a6e091f2cd28321ee196951f0edfd42bc1 EBUILD chromium-73.0.3683.10.ebuild 22130 BLAKE2B 0807f35a843542fc85c2becb60c4962e6c6331596194f23bf6e3580623d56b40875dc0885848041568aae50ef5c4280b8410c86f2bd4e4470583cc3e59ead9bc SHA512 40936fc2a0dfb00e728ee2d75c87be59bb5edcd5e019a05e9b22010e1e0cd6c2d6198809de5e996e11b71ed41aa1a4f6cf2edecfb114eb8c19d0e913f405dccf EBUILD chromium-74.0.3702.0.ebuild 22298 BLAKE2B c9bfe7c15521cc0bf9a3dfc396fb328b85d504d11f6bb8aa5e793ba29b40488e1c60cde4572b1ab5110faf01614aec3aba55730b8af40c73763ee5db528f69ac SHA512 4247220d728f2d5627d0e5e3888c032d152796b6ce837927aca93122bf6f7aea1b1785f0412ce6bd7444ecba53980f6cdb2af4039b9e8660d1eecb97f41e9cd6 EBUILD chromium-75.0.3745.4.ebuild 22034 BLAKE2B 0273d868c6d0855f173b3cedd5cdffe7b063a2f32d921a83617ba3efc8e7ef713935bd039a11a91e4690384f6b252621af4bb445469454e90d8e080a1462f6c9 SHA512 25ac24f33163c2b1fd7abef0ae296c0df1304f9fda7481e05d61f3cca93540b8b2a658f3bd0d8747b9f3fad30d609b8d5bb0c69029c6c37010661682497f25d4 diff --git a/www-client/chromium/chromium-100.0.4867.0.ebuild b/www-client/chromium/chromium-100.0.4867.0.ebuild new file mode 100644 index 0000000..6ded2cb --- /dev/null +++ b/www-client/chromium/chromium-100.0.4867.0.ebuild @@ -0,0 +1,963 @@ +# Copyright 2009-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +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 + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="https://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine" +REQUIRED_USE=" + component-build? ( !suid ) + screencast? ( wayland ) +" + +COMMON_X_DEPEND=" + media-libs/mesa:=[gbm(+)] + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXtst:= + x11-libs/libxcb:= + x11-libs/libxshmfence:= + vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) +" + +COMMON_DEPEND=" + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + dev-libs/expat:= + dev-libs/glib:2 + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + >=media-libs/freetype-2.11.0-r1:= + system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) + media-libs/libjpeg-turbo:= + system-png? ( media-libs/libpng:=[-apng] ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( + >=media-video/ffmpeg-4.3:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + >=media-libs/opus-1.3.1:= + ) + net-misc/curl[ssl] + sys-apps/dbus:= + sys-apps/pciutils:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/libxkbcommon:= + x11-libs/pango:= + media-libs/flac:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + kerberos? ( virtual/krb5 ) + !headless? ( + ${COMMON_X_DEPEND} + >=app-accessibility/at-spi2-atk-2.26:2 + >=app-accessibility/at-spi2-core-2.26:2 + >=dev-libs/atk-2.26 + x11-libs/gtk+:3[X] + wayland? ( + dev-libs/wayland:= + screencast? ( media-video/pipewire:0/0.3 ) + x11-libs/gtk+:3[wayland,X] + x11-libs/libdrm:= + ) + ) +" +RDEPEND="${COMMON_DEPEND} + x11-misc/xdg-utils + virtual/opengl + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) +" +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 + dev-lang/perl + >=dev-util/gn-0.1807 + dev-vcs/git + >=dev-util/gperf-3.0.3 + >=dev-util/ninja-1.7.2 + >=net-libs/nodejs-7.6.0[inspector] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig + js-type-check? ( virtual/jre ) +" + +# These are intended for ebuild maintainer use to force clang if GCC is broken. +: ${CHROMIUM_FORCE_CLANG=yes} +: ${CHROMIUM_FORCE_LIBCXX=no} + +if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then + BDEPEND+=" >=sys-devel/clang-12" +fi + +if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + RDEPEND+=" >=sys-libs/libcxx-12" + DEPEND+=" >=sys-libs/libcxx-12" +else + COMMON_DEPEND=" + dev-libs/libxslt:= + >=dev-libs/re2-0.2019.08.01:= + >=media-libs/openh264-1.6.0:= + system-icu? ( >=dev-libs/icu-69.1:= ) + " + RDEPEND+="${COMMON_DEPEND}" + DEPEND+="${COMMON_DEPEND}" +fi + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. + +For native file dialogs in KDE, install kde-apps/kdialog. + +To make password storage work with your desktop environment you may +have install one of the supported credentials management applications: +- app-crypt/libsecret (GNOME) +- kde-frameworks/kwallet (KDE) +If you have one of above packages installed, but don't want to use +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" + if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then + die "At least gcc 9.2 is required" + fi + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then + CPP="${CHOST}-clang++ -E" + if ! ver_test "$(clang-major-version)" -ge 12; then + die "At least clang 12 is required" + fi + fi + fi + + # Check build requirements, bug #541816 and bug #471810 . + CHECKREQS_MEMORY="4G" + CHECKREQS_DISK_BUILD="9G" + if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then + if use custom-cflags || use component-build; then + CHECKREQS_DISK_BUILD="25G" + fi + if ! use component-build; then + CHECKREQS_MEMORY="16G" + fi + fi + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config + + # nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams + if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then + ewarn "Proprietary nVidia driver does not work with Wayland. You can disable" + ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default." + fi +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local PATCHES=( + "${FILESDIR}/chromium-78-protobuf-RepeatedPtrField-export.patch" + "${FILESDIR}/chromium-100-compiler.patch" + "${FILESDIR}/chromium-100-ByteSwapUintPtrT-constexpr.patch" + "${FILESDIR}/chromium-100-LayoutUnit-constexpr.patch" + "${FILESDIR}/chromium-100-PartitionFreelistEntry-namespace.patch" + "${FILESDIR}/chromium-99-sqlcursor.patch" + "${FILESDIR}/chromium-99-sandbox-glib234.patch" + + "${FILESDIR}/chromium-93-InkDropHost-crash.patch" + "${FILESDIR}/chromium-98-EnumTable-crash.patch" + "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" + "${FILESDIR}/chromium-shim_headers.patch" + ) + + default + + 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 version + sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die + + local keeplibs=( + base/third_party/cityhash + base/third_party/double_conversion + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + net/third_party/quic + net/third_party/uri_template + third_party/abseil-cpp + third_party/angle + third_party/angle/src/common/third_party/base + third_party/angle/src/common/third_party/smhasher + third_party/angle/src/common/third_party/xxhash + third_party/angle/src/third_party/libXNVCtrl + third_party/angle/src/third_party/trace_event + third_party/angle/src/third_party/volk + third_party/apple_apsl + third_party/axe-core + third_party/blink + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + third_party/brotli + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/beautifulsoup4-4.9.3 + third_party/catapult/third_party/html5lib-1.1 + third_party/catapult/third_party/polymer + third_party/catapult/third_party/six + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jpeg-js + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/closure_compiler + third_party/crashpad + third_party/crashpad/crashpad/third_party/lss + third_party/crashpad/crashpad/third_party/zlib + third_party/crc32c + third_party/cros_system_api + third_party/dav1d + third_party/dawn + third_party/dawn/third_party/khronos + third_party/dawn/third_party/tint + third_party/depot_tools + third_party/devscripts + third_party/devtools-frontend + third_party/devtools-frontend/src/front_end/third_party/acorn + third_party/devtools-frontend/src/front_end/third_party/axe-core + third_party/devtools-frontend/src/front_end/third_party/chromium + third_party/devtools-frontend/src/front_end/third_party/codemirror + third_party/devtools-frontend/src/front_end/third_party/diff + third_party/devtools-frontend/src/front_end/third_party/i18n + third_party/devtools-frontend/src/front_end/third_party/intl-messageformat + third_party/devtools-frontend/src/front_end/third_party/lighthouse + third_party/devtools-frontend/src/front_end/third_party/lit-html + third_party/devtools-frontend/src/front_end/third_party/lodash-isequal + third_party/devtools-frontend/src/front_end/third_party/marked + third_party/devtools-frontend/src/front_end/third_party/puppeteer + 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 + third_party/eigen3 + third_party/emoji-segmenter + third_party/farmhash + third_party/fdlibm + third_party/fft2d + third_party/flatbuffers + third_party/freetype + third_party/fusejs + third_party/highway + third_party/libgifcodec + third_party/liburlpattern + third_party/libzip + third_party/gemmlowp + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/jinja2 + third_party/jsoncpp + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libXNVCtrl + third_party/libaddressinput + third_party/libaom + third_party/libaom/source/libaom/third_party/fastfeat + third_party/libaom/source/libaom/third_party/vector + third_party/libaom/source/libaom/third_party/x86inc + third_party/libavif + third_party/libgav1 + third_party/libjingle + third_party/libjxl + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libsync + third_party/libudev + third_party/libva_protected_content + third_party/libvpx + third_party/libvpx/source/libvpx/third_party/x86inc + third_party/libwebm + third_party/libx11 + third_party/libxcb-keysyms + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lottie + third_party/lss + third_party/lzma_sdk + third_party/mako + third_party/maldoca + third_party/maldoca/src/third_party/tensorflow_protos + third_party/maldoca/src/third_party/zlibwrapper + third_party/markupsafe + third_party/mesa + third_party/metrics_proto + third_party/minigbm + third_party/modp_b64 + third_party/nasm + third_party/nearby + third_party/neon_2_sse + third_party/node + third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 + third_party/one_euro_filter + third_party/opencv + third_party/openscreen + third_party/openscreen/src/third_party/mozilla + third_party/openscreen/src/third_party/tinycbor/src/src + 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 + third_party/pdfium/third_party/libopenjpeg20 + third_party/pdfium/third_party/libpng16 + third_party/pdfium/third_party/libtiff + third_party/pdfium/third_party/skia_shared + third_party/perfetto + third_party/perfetto/protos/third_party/chromium + third_party/pffft + third_party/ply + third_party/polymer + third_party/private-join-and-compute + third_party/private_membership + third_party/protobuf + third_party/protobuf/third_party/six + third_party/pyjson5 + third_party/qcms + third_party/rnnoise + third_party/s2cellid + third_party/securemessage + third_party/shell-encryption + third_party/simplejson + third_party/six + third_party/skia + third_party/skia/include/third_party/skcms + third_party/skia/include/third_party/vulkan + third_party/skia/third_party/skcms + third_party/skia/third_party/vulkan + third_party/smhasher + third_party/snappy + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/astc-encoder + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/marl + third_party/swiftshader/third_party/subzero + third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 + third_party/tcmalloc + third_party/tensorflow-text + third_party/tflite + third_party/tflite/src/third_party/eigen3 + third_party/tflite/src/third_party/fft2d + third_party/ruy + third_party/ukey2 + third_party/unrar + third_party/usrsctp + third_party/utf + third_party/vulkan + third_party/web-animations-js + third_party/webdriver + third_party/webgpu-cts + third_party/webrtc + third_party/webrtc/common_audio/third_party/ooura + third_party/webrtc/common_audio/third_party/spl_sqrt_floor + third_party/webrtc/modules/third_party/fft + third_party/webrtc/modules/third_party/g711 + third_party/webrtc/modules/third_party/g722 + third_party/webrtc/rtc_base/third_party/base64 + third_party/webrtc/rtc_base/third_party/sigslot + third_party/widevine + third_party/woff2 + third_party/wuffs + third_party/x11proto + third_party/xcbproto + third_party/zxcvbn-cpp + third_party/zlib/google + url/third_party/mozilla + v8/src/third_party/siphash + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/inspector_protocol + v8/third_party/v8 + + # gyp -> gn leftovers + base/third_party/libevent + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + ) + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if ! use system-png; then + keeplibs+=( third_party/libpng ) + fi + if use system-harfbuzz; then + keeplibs+=( third_party/harfbuzz-ng/utils ) + else + keeplibs+=( third_party/harfbuzz-ng ) + fi + if use wayland && ! use headless ; then + keeplibs+=( third_party/wayland ) + fi + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + keeplibs+=( third_party/libxml ) + keeplibs+=( third_party/libxslt ) + keeplibs+=( third_party/openh264 ) + keeplibs+=( third_party/re2 ) + if use system-icu; then + keeplibs+=( third_party/icu ) + fi + fi + if use arm64 || use ppc64 ; then + keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 ) + fi + # we need to generate ppc64 stuff because upstream does not ship it yet + # it has to be done before unbundling. + if use ppc64; then + pushd third_party/libvpx >/dev/null || die + mkdir -p source/config/linux/ppc64 || die + ./generate_gni.sh || die + popd >/dev/null || die + fi + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die + + if use js-type-check; then + ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die + fi + + # bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries + mkdir -p buildtools/third_party/eu-strip/bin || die + ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then + # Force clang since gcc is pretty broken at the moment. + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + die "Compiling with sys-libs/libcxx requires clang." + fi + myconf_gn+=" is_clang=false" + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138. + # DCHECK is fatal by default, make it configurable at runtime, #bug 807881. + myconf_gn+=" dcheck_always_on=$(usex debug true false)" + myconf_gn+=" dcheck_is_configurable=$(usex debug true false)" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_sqlite (http://crbug.com/22208). + + # libevent: https://bugs.gentoo.org/593458 + local gn_system_libraries=( + flac + fontconfig + freetype + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng + libdrm + libjpeg + libwebp + zlib + ) + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if use system-png; then + gn_system_libraries+=( libpng ) + fi + if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then + # unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++ + gn_system_libraries+=( libxml ) + gn_system_libraries+=( libxslt ) + gn_system_libraries+=( openh264 ) + gn_system_libraries+=( re2 ) + fi + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)" + + # Disable deprecated libgnome-keyring dependency, bug #713012 + myconf_gn+=" use_gnome_keyring=false" + + # Optional dependencies. + myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)" + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + myconf_gn+=" use_vaapi=$(usex vaapi true false)" + myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)" + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" disable_fieldtrial_testing_config=true" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false" + + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + + # 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}\"" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. The OAuth2 credentials, however, have been left out. + # Those OAuth2 credentials have been broken for quite some time anyway. + # Instead we apply a patch to use the --oauth2-client-id= and + # --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and + # GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into + # Chromium without baked-in values. + local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" + myconf_gn+=" google_api_key=\"${google_api_key}\"" + local myarch="$(tc-arch)" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Debug info section overflows without component build + # Prevent linker from running out of address space, bug #471810 . + if ! use component-build || use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 + fi + fi + + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + append-flags -stdlib=libc++ + append-ldflags -stdlib=libc++ + fi + + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + + # This is normally defined by compiler_cpu_abi in + # build/config/compiler/BUILD.gn, but we patch that part out. + append-flags -msse2 -mfpmath=sse -mmmx + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm) + elif [[ $myarch = ppc64 ]] ; then + myconf_gn+=" target_cpu=\"ppc64\"" + ffmpeg_target_arch=ppc64 + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # https://bugs.gentoo.org/654216 + addpredict /dev/dri/ #nowarn + + #if ! use system-ffmpeg; then + if false; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gn.py || die + popd > /dev/null || die + fi + + # Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470 + append-cxxflags $(test-flags-CXX -flax-vector-conversions=all) + + # Disable unknown warning message from clang. + tc-is-clang && append-flags -Wno-unknown-warning-option + + # Explicitly disable ICU data file support for system-icu builds. + if use system-icu; then + myconf_gn+=" icu_use_data_file=false" + fi + + # Enable ozone wayland and/or headless support + myconf_gn+=" use_ozone=true ozone_auto_platforms=false" + myconf_gn+=" ozone_platform_headless=true" + myconf_gn+=" ozone_platform_x11=$(usex headless false true)" + if use wayland || use headless; then + if use headless; then + myconf_gn+=" ozone_platform=\"headless\"" + myconf_gn+=" use_x11=false" + else + myconf_gn+=" ozone_platform_wayland=true" + myconf_gn+=" use_system_libdrm=true" + myconf_gn+=" use_system_minigbm=true" + myconf_gn+=" use_xkbcommon=true" + myconf_gn+=" ozone_platform=\"wayland\"" + fi + else + myconf_gn+=" ozone_platform=\"x11\"" + fi + + # Enable official builds + myconf_gn+=" is_official_build=$(usex official true false)" + myconf_gn+=" use_thin_lto=false" + if use official; then + # Allow building against system libraries in official builds + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py || die + # Disable CFI: unsupported for GCC, requires clang+lto+lld + myconf_gn+=" is_cfi=false" + # Disable PGO, because profile data is only compatible with >=clang-11 + myconf_gn+=" chrome_pgo_phase=0" + fi + + einfo "Configuring Chromium..." + set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + # Final link uses lots of file descriptors. + ulimit -n 2048 + + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + # Don't inherit PYTHONPATH from environment, bug #789021, #812689 + local -x PYTHONPATH= + + #"${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. + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome chromedriver + use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome + + mv out/Release/chromedriver{.unstripped,} || die + + # Build manpage; bug #684550 + sed -e 's|@@PACKAGE@@|chromium-browser|g; + s|@@MENUNAME@@|Chromium|g;' \ + chrome/app/resources/manpage.1.in > \ + out/Release/chromium-browser.1 || die + + # Build desktop file; bug #706786 + sed -e 's|@@MENUNAME@@|Chromium|g; + s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g; + s|@@PACKAGE@@|chromium-browser|g; + s|\(^Exec=\)/usr/bin/|\1|g;' \ + chrome/installer/linux/common/desktop.template > \ + out/Release/chromium-browser-chromium.desktop || die + + # Build vk_swiftshader_icd.json; bug #827861 + sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \ + third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \ + out/Release/vk_swiftshader_icd.json || die +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi + + doexe out/Release/chromedriver + doexe out/Release/chrome_crashpad_handler + + ozone_auto_session () { + use wayland && ! use headless && echo true || echo false + } + local sedargs=( -e + "s:/usr/lib/:/usr/$(get_libdir)/:g; + s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g" + ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + ( + shopt -s nullglob + local files=(out/Release/*.so out/Release/*.so.[0-9]) + [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}" + ) + + if ! use system-icu; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + doins -r out/Release/resources + doins -r out/Release/MEIPreload + + # Install vk_swiftshader_icd.json; bug #827861 + doins out/Release/vk_swiftshader_icd.json + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + # Install icons + local branding size + for size in 16 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + # Install desktop entry + domenu out/Release/chromium-browser-chromium.desktop + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + # Install manpage; bug #684550 + doman out/Release/chromium-browser.1 + dosym chromium-browser.1 /usr/share/man/man1/chromium.1 + + readme.gentoo_create_doc +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog + + if use vaapi; then + elog "VA-API is disabled by default at runtime. You have to enable it" + elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS" + elog "in /etc/chromium/default." + fi + if use screencast; then + elog "Screencast is disabled by default at runtime. Either enable it" + elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer" + elog "inside Chromium or add --enable-webrtc-pipewire-capturer" + elog "to CHROMIUM_FLAGS in /etc/chromium/default." + fi +} diff --git a/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch b/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch new file mode 100644 index 0000000..dc85dc2 --- /dev/null +++ b/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch @@ -0,0 +1,56 @@ +From 1ea2079fec7098cd0fdfabce259d65a09197532d Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Thu, 27 Jan 2022 14:36:21 +0000 +Subject: [PATCH] GCC: add constexpr to base::ByteSwapUintPtrT and + base::ByteSwap + +base::internal::EncodedPartitionFreelistEntryPtr::Transform() is +constexpr. This requires base::ByteSwapUintPtrT() and +base::ByteSwap() to be constexpr too. +--- + base/sys_byteorder.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/base/sys_byteorder.h b/base/sys_byteorder.h +index 4de2b5f..d86cc36 100644 +--- a/base/sys_byteorder.h ++++ b/base/sys_byteorder.h +@@ -22,7 +22,7 @@ + namespace base { + + // Returns a value with all bytes in |x| swapped, i.e. reverses the endianness. +-inline uint16_t ByteSwap(uint16_t x) { ++constexpr uint16_t ByteSwap(uint16_t x) { + #if defined(COMPILER_MSVC) && !defined(__clang__) + return _byteswap_ushort(x); + #else +@@ -30,7 +30,7 @@ inline uint16_t ByteSwap(uint16_t x) { + #endif + } + +-inline uint32_t ByteSwap(uint32_t x) { ++constexpr uint32_t ByteSwap(uint32_t x) { + #if defined(COMPILER_MSVC) && !defined(__clang__) + return _byteswap_ulong(x); + #else +@@ -38,7 +38,7 @@ inline uint32_t ByteSwap(uint32_t x) { + #endif + } + +-inline uint64_t ByteSwap(uint64_t x) { ++constexpr uint64_t ByteSwap(uint64_t x) { + // Per build/build_config.h, clang masquerades as MSVC on Windows. If we are + // actually using clang, we can rely on the builtin. + // +@@ -53,7 +53,7 @@ inline uint64_t ByteSwap(uint64_t x) { + #endif + } + +-inline uintptr_t ByteSwapUintPtrT(uintptr_t x) { ++constexpr uintptr_t ByteSwapUintPtrT(uintptr_t x) { + // We do it this way because some build configurations are ILP32 even when + // defined(ARCH_CPU_64_BITS). Unfortunately, we can't use sizeof in #ifs. But, + // because these conditionals are constexprs, the irrelevant branches will +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch b/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch new file mode 100644 index 0000000..41943c4 --- /dev/null +++ b/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch @@ -0,0 +1,31 @@ +From 23384ca857117c7dff6627847638e0ab2b9a9e6c Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Tue, 25 Jan 2022 17:29:49 +0000 +Subject: [PATCH] GCC: default initialize member in blink::LayoutUnit + constructor + +Before C++20 the compiler is not required to check that members are +initialized before use in constexpr constructors. However, +expressions with undefined behaviour (e.g. due to unitialized data +members) is prohibited for constexpr. Default initialize to +value_ to 0 to workaround the problem. +--- + third_party/blink/renderer/platform/geometry/layout_unit.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/platform/geometry/layout_unit.h b/third_party/blink/renderer/platform/geometry/layout_unit.h +index e6cbe37..d1e4f07 100644 +--- a/third_party/blink/renderer/platform/geometry/layout_unit.h ++++ b/third_party/blink/renderer/platform/geometry/layout_unit.h +@@ -95,7 +95,7 @@ class LayoutUnit { + public: + constexpr LayoutUnit() : value_(0) {} + template <typename IntegerType> +- constexpr explicit LayoutUnit(IntegerType value) { ++ constexpr explicit LayoutUnit(IntegerType value) : value_(0) { + if (std::is_signed<IntegerType>::value) + SaturatedSet(static_cast<int>(value)); + else +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch b/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch new file mode 100644 index 0000000..0ca9956 --- /dev/null +++ b/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch @@ -0,0 +1,26 @@ +From f6490c3b85b1d6f2043c59680ac7c273b03b5a39 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Sun, 6 Feb 2022 07:58:32 +0000 +Subject: [PATCH] libstdc++: add namespace for nullptr_t in + PartitionFreelistEntry + +--- + base/allocator/partition_allocator/partition_freelist_entry.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/allocator/partition_allocator/partition_freelist_entry.h b/base/allocator/partition_allocator/partition_freelist_entry.h +index cb20598..850d27b 100644 +--- a/base/allocator/partition_allocator/partition_freelist_entry.h ++++ b/base/allocator/partition_allocator/partition_freelist_entry.h +@@ -86,7 +86,7 @@ class EncodedPartitionFreelistEntryPtr { + // the rationale and mechanism, respectively. + class PartitionFreelistEntry { + private: +- explicit constexpr PartitionFreelistEntry(nullptr_t) ++ explicit constexpr PartitionFreelistEntry(std::nullptr_t) + : encoded_next_(EncodedPartitionFreelistEntryPtr(nullptr)) + #if defined(PA_HAS_FREELIST_SHADOW_ENTRY) + , +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-compiler.patch b/www-client/chromium/files/chromium-100-compiler.patch new file mode 100644 index 0000000..e4ca9b3 --- /dev/null +++ b/www-client/chromium/files/chromium-100-compiler.patch @@ -0,0 +1,220 @@ +From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Thu, 3 Feb 2022 16:26:20 +0000 +Subject: [PATCH] Disable various compiler configs + +--- + build/config/compiler/BUILD.gn | 105 ++++++--------------------------- + 1 file changed, 17 insertions(+), 88 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 61ceb0d..7392018 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -291,9 +291,7 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", + ":rustc_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ":compiler_deterministic", + ] +@@ -534,31 +532,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 ] +- +- # 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" ] +@@ -1235,45 +1208,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=." ] +- } +- 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. +@@ -1594,7 +1528,7 @@ config("chromium_code") { + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] ++ cflags = [] + if (treat_warnings_as_errors) { + cflags += [ "-Werror" ] + +@@ -1603,10 +1537,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. +@@ -1615,15 +1545,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") { +- # 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" ] +@@ -2026,7 +1947,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. +@@ -2064,7 +1986,8 @@ config("optimize") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2104,7 +2027,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: +@@ -2137,7 +2061,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: +@@ -2163,7 +2088,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 +@@ -2283,7 +2209,8 @@ config("win_pdbaltpath") { + } + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (is_clang) { + cflags = [ "/Z7" ] # Debug information in the .obj files. +@@ -2411,7 +2338,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 = [] +@@ -2480,7 +2408,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" ] + +-- +2.34.1 + |