www-client/chromium: remove old
authorMike Gilbert <floppym@gentoo.org>
Sat, 30 May 2020 00:19:04 +0000 (20:19 -0400)
committerMike Gilbert <floppym@gentoo.org>
Sat, 30 May 2020 00:19:04 +0000 (20:19 -0400)
Bug: https://bugs.gentoo.org/724008
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
www-client/chromium/Manifest
www-client/chromium/chromium-81.0.4044.138.ebuild [deleted file]
www-client/chromium/files/chromium-80-gcc-blink.patch [deleted file]
www-client/chromium/files/chromium-81-gcc-10.patch [deleted file]
www-client/chromium/files/chromium-81-gcc-constexpr.patch [deleted file]
www-client/chromium/files/chromium-81-gcc-noexcept.patch [deleted file]
www-client/chromium/files/chromium-81-icu67.patch [deleted file]
www-client/chromium/files/chromium-compiler-r11.patch [deleted file]

index a68fc1ceda68b98f785f60528d1c61c66b35c3b6..a37ec5e53f6756366c330ce99c2be9452f88b33f 100644 (file)
@@ -1,4 +1,3 @@
-DIST chromium-81.0.4044.138.tar.xz 785960928 BLAKE2B fb8ea6aae55450e820f91fc8be7948ac0155beb0fc6a05988506a78b3306ffc52e69b10d3c91e4a29fe2171f339d5331e9524d3e4cd08de57e090ce16412a673 SHA512 9f686b27b2f8ea5c15f50b0ddcd24745aec41e28af8c38618e18771401bd5cfb26939b9ac49973ea804cda458a939c1a6ad59cb24fb1937b7687c3d908183437
 DIST chromium-83.0.4103.61.tar.xz 802558244 BLAKE2B d71ec15bea46438dccda49bb5d8ca0013e89e6876470aba077fbad70578a6f4d9ffb71150a9f0c676740be1cf3a7c681077e39ee9cf961b508b8a59167b4b949 SHA512 0fa179bdc61399c3e15e03ce1e720ca6487df603712689ffd4161ef1103c131b0baaedca3c7d706dfdcd2fa3328337cc4a807c0478a429f88358e512cfacbcba
 DIST chromium-84.0.4136.5.tar.xz 840308252 BLAKE2B 3f10ea5dbb48dd2a39cfb8d39289ad439d0257bea6e40ff130d427f96252890a6164a8dae3b5d30b7e74bcb87815055a6f27826add3ef5e9849e72c6a7dcc3b1 SHA512 9b6285ec2bb9790b8e1593473f8e1f2642a6fa851fb5645c282c48911dffabc2107aa99c90b6d6450eb8c0dc38daa089c514801921bc1ac782b25e34d9b8fd84
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-81.0.4044.138.ebuild b/www-client/chromium/chromium-81.0.4044.138.ebuild
deleted file mode 100644 (file)
index b6f1330..0000000
+++ /dev/null
@@ -1,764 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-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 multilib ninja-utils pax-utils portability 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="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-       >=app-accessibility/at-spi2-atk-2.26:2
-       app-arch/bzip2:=
-       cups? ( >=net-print/cups-1.3.11:= )
-       >=dev-libs/atk-2.26
-       dev-libs/expat:=
-       dev-libs/glib:2
-       system-icu? ( >=dev-libs/icu-65:= )
-       >=dev-libs/libxml2-2.9.4-r3:=[icu]
-       dev-libs/libxslt:=
-       dev-libs/nspr:=
-       >=dev-libs/nss-3.26:=
-       >=dev-libs/re2-0.2019.08.01:=
-       >=media-libs/alsa-lib-1.0.19:=
-       media-libs/fontconfig:=
-       media-libs/freetype:=
-       >=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-       media-libs/libjpeg-turbo:=
-       media-libs/libpng:=
-       media-libs/mesa:=[gbm]
-       system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-       >=media-libs/openh264-1.6.0:=
-       pulseaudio? ( media-sound/pulseaudio:= )
-       system-ffmpeg? (
-               >=media-video/ffmpeg-4:=
-               || (
-                       media-video/ffmpeg[-samba]
-                       >=net-fs/samba-4.5.10-r1[-debug(-)]
-               )
-               >=media-libs/opus-1.3.1:=
-       )
-       sys-apps/dbus:=
-       sys-apps/pciutils:=
-       virtual/udev
-       x11-libs/cairo:=
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:3[X]
-       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/libXScrnSaver:=
-       x11-libs/libXtst:=
-       x11-libs/pango:=
-       app-arch/snappy:=
-       media-libs/flac:=
-       >=media-libs/libwebp-0.4.0:=
-       sys-libs/zlib:=[minizip]
-       kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-       x11-misc/xdg-utils
-       virtual/opengl
-       virtual/ttf-fonts
-       selinux? ( sec-policy/selinux-chromium )
-       tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-       ${PYTHON_DEPS}
-       >=app-arch/gzip-1.7
-       dev-lang/perl
-       dev-util/gn
-       dev-vcs/git
-       >=dev-util/gperf-3.0.3
-       >=dev-util/ninja-1.7.2
-       >=net-libs/nodejs-7.6.0[inspector]
-       sys-apps/hwids[usb(+)]
-       >=sys-devel/bison-2.4.3
-       sys-devel/flex
-       virtual/pkgconfig
-       closure-compile? ( virtual/jre )
-       !system-libvpx? (
-               amd64? ( dev-lang/yasm )
-               x86? ( dev-lang/yasm )
-       )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-       BDEPEND+=" >=sys-devel/clang-7"
-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.
-"
-
-PATCHES=(
-       "${FILESDIR}/chromium-compiler-r11.patch"
-       "${FILESDIR}/chromium-fix-char_traits.patch"
-       "${FILESDIR}/chromium-78-protobuf-export.patch"
-       "${FILESDIR}/chromium-79-gcc-alignas.patch"
-       "${FILESDIR}/chromium-80-gcc-quiche.patch"
-       "${FILESDIR}/chromium-80-gcc-blink.patch"
-       "${FILESDIR}/chromium-81-gcc-noexcept.patch"
-       "${FILESDIR}/chromium-81-gcc-constexpr.patch"
-       "${FILESDIR}/chromium-81-gcc-10.patch"
-       "${FILESDIR}/chromium-81-icu67.patch"
-       "${FILESDIR}/chromium-81-re2-0.2020.05.01.patch"
-)
-
-pre_build_checks() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               local -x CPP="$(tc-getCXX) -E"
-               if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-                       die "At least gcc 8.0 is required"
-               fi
-               # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
-               if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
-                       die "Component build with tcmalloc requires FEATURES=-usersandbox."
-               fi
-               if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-                       if use component-build; then
-                               die "Component build with clang requires fuzzer headers."
-                       fi
-               fi
-       fi
-
-       # Check build requirements, bug #541816 and bug #471810 .
-       CHECKREQS_MEMORY="3G"
-       CHECKREQS_DISK_BUILD="7G"
-       if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-               CHECKREQS_DISK_BUILD="25G"
-               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
-}
-
-src_prepare() {
-       # Calling this here supports resumption via FEATURES=keepwork
-       python_setup
-
-       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
-
-       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/compiler
-               third_party/angle/src/third_party/libXNVCtrl
-               third_party/angle/src/third_party/trace_event
-               third_party/angle/src/third_party/volk
-               third_party/angle/third_party/glslang
-               third_party/angle/third_party/spirv-headers
-               third_party/angle/third_party/spirv-tools
-               third_party/angle/third_party/vulkan-headers
-               third_party/angle/third_party/vulkan-loader
-               third_party/angle/third_party/vulkan-tools
-               third_party/angle/third_party/vulkan-validation-layers
-               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/cacheinvalidation
-               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
-               third_party/catapult/third_party/html5lib-python
-               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/depot_tools
-               third_party/devscripts
-               third_party/devtools-frontend
-               third_party/devtools-frontend/src/front_end/third_party/fabricjs
-               third_party/devtools-frontend/src/front_end/third_party/wasmparser
-               third_party/devtools-frontend/src/third_party
-               third_party/dom_distiller_js
-               third_party/emoji-segmenter
-               third_party/flatbuffers
-               third_party/freetype
-               third_party/libgifcodec
-               third_party/glslang
-               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/vector
-               third_party/libaom/source/libaom/third_party/x86inc
-               third_party/libjingle
-               third_party/libphonenumber
-               third_party/libsecret
-               third_party/libsrtp
-               third_party/libsync
-               third_party/libudev
-               third_party/libwebm
-               third_party/libxml/chromium
-               third_party/libyuv
-               third_party/llvm
-               third_party/lss
-               third_party/lzma_sdk
-               third_party/markupsafe
-               third_party/mesa
-               third_party/metrics_proto
-               third_party/modp_b64
-               third_party/nasm
-               third_party/node
-               third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-               third_party/one_euro_filter
-               third_party/openscreen
-               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/pffft
-               third_party/ply
-               third_party/polymer
-               third_party/private-join-and-compute
-               third_party/protobuf
-               third_party/protobuf/third_party/six
-               third_party/pyjson5
-               third_party/qcms
-               third_party/rnnoise
-               third_party/s2cellid
-               third_party/simplejson
-               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/spirv-headers
-               third_party/SPIRV-Tools
-               third_party/sqlite
-               third_party/swiftshader
-               third_party/swiftshader/third_party/llvm-7.0
-               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/unrar
-               third_party/usrsctp
-               third_party/vulkan
-               third_party/web-animations-js
-               third_party/webdriver
-               third_party/webrtc
-               third_party/webrtc/common_audio/third_party/fft4g
-               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/zlib/google
-               tools/grit/third_party/six
-               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/adobe
-               third_party/speech-dispatcher
-               third_party/usb_ids
-               third_party/xdg-utils
-               third_party/yasm/run_yasm.py
-       )
-       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-libvpx; then
-               keeplibs+=( third_party/libvpx )
-               keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-
-               # 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
-       fi
-       if use tcmalloc; then
-               keeplibs+=( third_party/tcmalloc )
-       fi
-
-       # Remove most bundled libraries. Some are still needed.
-       build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || 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
-               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"
-
-       # 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)"
-
-       myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-       # 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_libsrtp (bug #459932).
-       # TODO: use_system_protobuf (bug #525560).
-       # TODO: use_system_ssl (http://crbug.com/58087).
-       # 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
-               libpng
-               libwebp
-               libxml
-               libxslt
-               openh264
-               re2
-               snappy
-               yasm
-               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-libvpx; then
-               gn_system_libraries+=( libvpx )
-       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=true"
-
-       # Disable deprecated libgnome-keyring dependency, bug #713012
-       myconf_gn+=" use_gnome_keyring=false"
-
-       # Optional dependencies.
-       myconf_gn+=" closure_compile=$(usex closure-compile 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)"
-
-       # TODO: link_pulseaudio=true for GN.
-
-       myconf_gn+=" fieldtrial_testing_like_official_build=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 linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-       # Disable forced lld, bug 641556
-       myconf_gn+=" use_lld=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.
-       local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-       local google_default_client_id="329227923882.apps.googleusercontent.com"
-       local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-       myconf_gn+=" google_api_key=\"${google_api_key}\""
-       myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-       myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-       local myarch="$(tc-arch)"
-
-       # Avoid CFLAGS problems, bug #352457, bug #390147.
-       if ! use custom-cflags; then
-               replace-flags "-Os" "-O2"
-               strip-flags
-
-               # Prevent linker from running out of address space, bug #471810 .
-               if 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
-               fi
-       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)
-
-       # Explicitly disable ICU data file support for system-icu builds.
-       if use system-icu; then
-               myconf_gn+=" icu_use_data_file=false"
-       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
-
-       #"${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
-
-       # 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
-}
-
-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
-
-       local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-       sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.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
-       doins out/Release/*.so
-
-       if ! use system-icu; then
-               doins out/Release/icudtl.dat
-       fi
-
-       doins -r out/Release/locales
-       doins -r out/Release/resources
-
-       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
-}
diff --git a/www-client/chromium/files/chromium-80-gcc-blink.patch b/www-client/chromium/files/chromium-80-gcc-blink.patch
deleted file mode 100644 (file)
index 2118b46..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc: In member function 'void blink::DeleteSelectionCommand::InitializePositionData(blink::EditingState*)':
-../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:256:59: error: no matching function for call to 'EnclosingNodeOfType(blink::Position&, <unresolved overloaded function type>)'
-  256 |       EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));
-      |                                                           ^
-In file included from ../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:34:
-../../third_party/blink/renderer/core/editing/editing_utilities.h:112:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const Position&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'
-  112 | CORE_EXPORT Node* EnclosingNodeOfType(
-      |                   ^~~~~~~~~~~~~~~~~~~
-../../third_party/blink/renderer/core/editing/editing_utilities.h:114:12: note:   no known conversion for argument 2 from '<unresolved overloaded function type>' to 'bool (*)(const blink::Node*)'
-  114 |     bool (*node_is_of_type)(const Node*),
-      |     ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../third_party/blink/renderer/core/editing/editing_utilities.h:116:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const PositionInFlatTree&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'
-  116 | CORE_EXPORT Node* EnclosingNodeOfType(
-      |                   ^~~~~~~~~~~~~~~~~~~
-../../third_party/blink/renderer/core/editing/editing_utilities.h:117:5: note:   no known conversion for argument 1 from 'blink::Position' {aka 'blink::PositionTemplate<blink::EditingAlgorithm<blink::NodeTraversal> >'} to 'const PositionInFlatTree&' {aka 'const blink::PositionTemplate<blink::EditingAlgorithm<blink::FlatTreeTraversal> >&'}
-  117 |     const PositionInFlatTree&,
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~~
-
-diff --git a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
-index 6ff6906..dd531ae 100644
---- a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
-+++ b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
-@@ -224,6 +224,10 @@ static Position TrailingWhitespacePosition(const Position& position,
-   return Position();
- }
-+static bool IsAHTMLTableRowElement(const Node* node) {
-+  return IsA<HTMLTableRowElement>(node);
-+}
-+
- void DeleteSelectionCommand::InitializePositionData(
-     EditingState* editing_state) {
-   DCHECK(!GetDocument().NeedsLayoutTreeUpdate());
-@@ -253,9 +257,9 @@ void DeleteSelectionCommand::InitializePositionData(
-   end_root_ = RootEditableElementOf(end);
-   start_table_row_ = To<HTMLTableRowElement>(
--      EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));
-+      EnclosingNodeOfType(start, &IsAHTMLTableRowElement));
-   end_table_row_ = To<HTMLTableRowElement>(
--      EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>));
-+      EnclosingNodeOfType(end, &IsAHTMLTableRowElement));
-   // Don't move content out of a table cell.
-   // If the cell is non-editable, enclosingNodeOfType won't return it by
diff --git a/www-client/chromium/files/chromium-81-gcc-10.patch b/www-client/chromium/files/chromium-81-gcc-10.patch
deleted file mode 100644 (file)
index e0690d1..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From 797a8ef5b7a5d3ab513a4eef68755a939dc570be Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 7 Apr 2020 10:02:27 +0000
-Subject: [PATCH] GCC: fix includes for gcc-10
-
----
- base/trace_event/trace_event_memory_overhead.h                  | 1 +
- chrome/browser/search/background/ntp_backgrounds.h              | 1 +
- media/cdm/supported_cdm_versions.h                              | 1 +
- third_party/angle/include/platform/Platform.h                   | 1 +
- third_party/perfetto/include/perfetto/base/task_runner.h        | 1 +
- third_party/webrtc/call/rtx_receive_stream.h                    | 1 +
- .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h  | 1 +
- ui/gfx/linux/drm_util_linux.h                                   | 2 ++
- 8 files changed, 9 insertions(+)
-
-diff --git a/base/trace_event/trace_event_memory_overhead.h b/base/trace_event/trace_event_memory_overhead.h
-index 69468d4..3f5b786 100644
---- a/base/trace_event/trace_event_memory_overhead.h
-+++ b/base/trace_event/trace_event_memory_overhead.h
-@@ -9,6 +9,7 @@
- #include <stdint.h>
- #include <unordered_map>
-+#include <string>
- #include "base/base_export.h"
- #include "base/macros.h"
-diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
-index 7afc0a2..6d0957e 100644
---- a/chrome/browser/search/background/ntp_backgrounds.h
-+++ b/chrome/browser/search/background/ntp_backgrounds.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
- #include <array>
-+#include <cstddef>
- class GURL;
-diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h
-index dbe59ba..5216cfe 100644
---- a/media/cdm/supported_cdm_versions.h
-+++ b/media/cdm/supported_cdm_versions.h
-@@ -6,6 +6,7 @@
- #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
- #include <array>
-+#include <cstddef>
- #include "media/base/media_export.h"
- #include "media/cdm/api/content_decryption_module.h"
-diff --git a/third_party/angle/include/platform/Platform.h b/third_party/angle/include/platform/Platform.h
-index 09505a3..8833fa0 100644
---- a/third_party/angle/include/platform/Platform.h
-+++ b/third_party/angle/include/platform/Platform.h
-@@ -11,6 +11,7 @@
- #include <stdint.h>
- #include <array>
-+#include <cstddef>
- #define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482
-diff --git a/third_party/perfetto/include/perfetto/base/task_runner.h b/third_party/perfetto/include/perfetto/base/task_runner.h
-index cf60401..02658e7 100644
---- a/third_party/perfetto/include/perfetto/base/task_runner.h
-+++ b/third_party/perfetto/include/perfetto/base/task_runner.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
- #include <functional>
-+#include <cstdint>
- #include "perfetto/base/export.h"
-diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa440..113a816 100644
---- a/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/third_party/webrtc/call/rtx_receive_stream.h
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
- #include <map>
-+#include <cstdint>
- #include "call/rtp_packet_sink_interface.h"
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c9..69e624e 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- #include <array>
-+#include <cstddef>
- namespace webrtc {
-diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
-index 86ff2eb..990f12c 100644
---- a/ui/gfx/linux/drm_util_linux.h
-+++ b/ui/gfx/linux/drm_util_linux.h
-@@ -7,6 +7,8 @@
- #include "ui/gfx/buffer_types.h"
-+#include <cstdint>
-+
- namespace ui {
- int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
--- 
-2.24.1
-
diff --git a/www-client/chromium/files/chromium-81-gcc-constexpr.patch b/www-client/chromium/files/chromium-81-gcc-constexpr.patch
deleted file mode 100644 (file)
index a9c1507..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/ui/views/layout/layout_types.h b/ui/views/layout/layout_types.h
-index 8f9dbf4..ba118b9 100644
---- a/ui/views/layout/layout_types.h
-+++ b/ui/views/layout/layout_types.h
-@@ -45,12 +45,12 @@ class VIEWS_EXPORT SizeBounds {
-   ~SizeBounds() = default;
-   constexpr const base::Optional<int>& width() const { return width_; }
--  constexpr void set_width(base::Optional<int> width) {
-+  inline void set_width(base::Optional<int> width) {
-     width_ = std::move(width);
-   }
-   constexpr const base::Optional<int>& height() const { return height_; }
--  constexpr void set_height(base::Optional<int> height) {
-+  inline void set_height(base::Optional<int> height) {
-     height_ = std::move(height);
-   }
diff --git a/www-client/chromium/files/chromium-81-gcc-noexcept.patch b/www-client/chromium/files/chromium-81-gcc-noexcept.patch
deleted file mode 100644 (file)
index a6fc8af..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc
-index 38ab6be..dccf07f 100644
---- a/components/paint_preview/browser/paint_preview_client.cc
-+++ b/components/paint_preview/browser/paint_preview_client.cc
-@@ -78,7 +78,7 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default;
- PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default;
- PaintPreviewClient::PaintPreviewData& PaintPreviewClient::PaintPreviewData::
--operator=(PaintPreviewData&& rhs) noexcept = default;
-+operator=(PaintPreviewData&& rhs) = default;
- PaintPreviewClient::PaintPreviewData::PaintPreviewData(
-     PaintPreviewData&& other) noexcept = default;
diff --git a/www-client/chromium/files/chromium-81-icu67.patch b/www-client/chromium/files/chromium-81-icu67.patch
deleted file mode 100644 (file)
index 745bad2..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-From 3f8dc4b2e5baf77b463334c769af85b79d8c1463 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Fri, 03 Apr 2020 23:13:54 -0700
-Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions
-
-Needed to land ICU67.1 soon.
-
-Bug: v8:10393
-Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#67027}
----
-
-(backported for chromium-81)
-
-diff --git a/v8/src/objects/js-number-format.cc b/v8/src/objects/js-number-format.cc
-index 92d3e2f..ced408a 100644
---- a/v8/src/objects/js-number-format.cc
-+++ b/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
-     double number = numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  return Just(result);
-+  return Just(true);
- }
- }  // namespace
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
- namespace {
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
-   Handle<JSArray> result = factory->NewJSArray(0);
-   Maybe<int> maybe_format_to_parts = ConstructParts(
--      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+      isolate, &formatted, result, 0, numeric_obj,
-       number_format->style() == JSNumberFormat::Style::UNIT);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
diff --git a/www-client/chromium/files/chromium-compiler-r11.patch b/www-client/chromium/files/chromium-compiler-r11.patch
deleted file mode 100644 (file)
index f1b958a..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 6 Feb 2020 07:46:57 +0000
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 64 +++++++++++++---------------------
- 1 file changed, 25 insertions(+), 39 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index eef1140..b34b55b 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -260,8 +260,6 @@ config("compiler") {
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-     ":compiler_deterministic",
-   ]
-@@ -486,20 +484,6 @@ config("compiler") {
-     }
-   }
--  if (is_clang && !is_nacl && !use_xcode_clang) {
--    cflags += [ "-fcrash-diagnostics-dir=" +
--                rebase_path("//tools/clang/crashreports", root_build_dir) ]
--
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # C11/C++11 compiler flags setup.
-   # ---------------------------
-   if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -1446,6 +1430,12 @@ config("default_warnings") {
-         cflags_cc += [ "-Wno-class-memaccess" ]
-       }
-+      # -Wno-class-memaccess warns about hash table and vector in blink.
-+      # But the violation is intentional.
-+      if (!is_nacl) {
-+        cflags_cc += [ "-Wno-class-memaccess" ]
-+      }
-+
-       # -Wunused-local-typedefs is broken in gcc,
-       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
-       cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1560,7 +1550,7 @@ config("chromium_code") {
-       defines = [ "_HAS_NODISCARD" ]
-     }
-   } else {
--    cflags = [ "-Wall" ]
-+    cflags = []
-     if (treat_warnings_as_errors) {
-       cflags += [ "-Werror" ]
-@@ -1569,10 +1559,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.
-@@ -1581,15 +1567,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" ]
-@@ -1993,7 +1970,8 @@ config("default_stack_frames") {
- }
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -2019,7 +1997,8 @@ config("optimize") {
- }
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -2042,7 +2021,8 @@ config("optimize_no_wpo") {
- }
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -2076,7 +2056,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:
-@@ -2115,7 +2096,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:
-@@ -2145,7 +2127,8 @@ config("optimize_speed") {
-   }
- }
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2261,7 +2244,8 @@ config("win_pdbaltpath") {
- }
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2371,7 +2355,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 = []
-@@ -2426,7 +2411,8 @@ config("minimal_symbols") {
- }
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.24.1
-