From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD8F9138350 for ; Thu, 6 Feb 2020 20:24:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 658DCE086A; Thu, 6 Feb 2020 20:24:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34D50E086A for ; Thu, 6 Feb 2020 20:24:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D49A534E835 for ; Thu, 6 Feb 2020 20:24:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ED3EEE for ; Thu, 6 Feb 2020 20:24:01 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1581020632.0fa03d97f8516e35e00f7a1bbfb78580cb35dbed.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/Manifest www-client/chromium/chromium-79.0.3945.130.ebuild www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch www-client/chromium/files/chromium-79-gcc-name-clash.patch www-client/chromium/files/chromium-79-gcc-permissive.patch www-client/chromium/files/chromium-79-icu-65.patch www-client/chromium/files/chromium-79-include.patch www-client/chromium/files/chromium-79-system-hb.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0fa03d97f8516e35e00f7a1bbfb78580cb35dbed X-VCS-Branch: master Date: Thu, 6 Feb 2020 20:24:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 566fe8ae-545e-4fe6-9d32-f0d3fb4e0191 X-Archives-Hash: e392cf83799df3b990050fe1e12d48d8 commit: 0fa03d97f8516e35e00f7a1bbfb78580cb35dbed Author: Stephan Hartmann googlemail com> AuthorDate: Thu Feb 6 12:33:20 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Feb 6 20:23:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa03d97 www-client/chromium: security cleanup Bug: https://bugs.gentoo.org/708322 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann googlemail.com> Signed-off-by: Mike Gilbert gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/14580 www-client/chromium/Manifest | 1 - www-client/chromium/chromium-79.0.3945.130.ebuild | 736 --------------------- .../chromium-79-gcc-ambiguous-nodestructor.patch | 39 -- .../files/chromium-79-gcc-name-clash.patch | 135 ---- .../files/chromium-79-gcc-permissive.patch | 79 --- www-client/chromium/files/chromium-79-icu-65.patch | 13 - .../chromium/files/chromium-79-include.patch | 131 ---- .../chromium/files/chromium-79-system-hb.patch | 19 - 8 files changed, 1153 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 840c9362824..23022952130 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,2 @@ -DIST chromium-79.0.3945.130.tar.xz 778319112 BLAKE2B ac6d7c08c34afc4de8383964f76a5eabc9209de185535a27eff2d6934a77d01fd6b07d5c5afb16e9dd936b2650da76d460e8a485ab16f8300144c7de9b3be2bb SHA512 4b5d4769b068f20b8028085a148cbaf31311eeffad0a22c5c0909af273a8e57e077b33cc93331bbeff9165477262eed2e345b2224ac4f76d8bdb79f983596a81 DIST chromium-80.0.3987.87.tar.xz 801310184 BLAKE2B d051f77b0e6f167632e383e23983531ee1f44f1fce1629f482cf42882c294816bd98c51ad043b5258aa9652a8da14edf278f70fc63f6978c9dfececa547a1fca SHA512 69aebd760d9b8f2c5f4d15a3a144cd4292ffb11b1536af3596f907e730ac64e909d739bb6e9d322a8f56fac75e4f0b2b5c4c36c4fe4bb52147276b5b0dd03620 DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f SHA512 47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed diff --git a/www-client/chromium/chromium-79.0.3945.130.ebuild b/www-client/chromium/chromium-79.0.3945.130.ebuild deleted file mode 100644 index 76a0f4f0682..00000000000 --- a/www-client/chromium/chromium-79.0.3945.130.ebuild +++ /dev/null @@ -1,736 +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="http://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 gnome-keyring +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.2016.11.01:= - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=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:= - system-libvpx? ( media-libs/libvpx:=[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(-)] - ) - !=net-fs/samba-4.5.12-r0 - media-libs/opus:= - ) - 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} - ! 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 ) - 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" - - # 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_gnome_keyring=$(usex gnome-keyring 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) - 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 - - # 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 -} - -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 and desktop entry. - 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 - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser \ - "Chromium" \ - chromium-browser \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # 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-79-gcc-ambiguous-nodestructor.patch b/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch deleted file mode 100644 index d43a091b971..00000000000 --- a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch +++ /dev/null @@ -1,39 +0,0 @@ -From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Fri, 25 Oct 2019 19:01:29 +0000 -Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector - -Constructing NoDestructor with parenthesis constructor is ambiguous -in GCC. Use brace-initializer to avoid that problem. This fixes this -build error: - -Bug: 819294 -Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910 -Reviewed-by: Eric Orth -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#709569} ---- - -diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc -index 14997c4..637b6f2 100644 ---- a/net/dns/dns_util.cc -+++ b/net/dns/dns_util.cc -@@ -144,7 +144,7 @@ - // DohProviderId histogram suffix list in - // tools/metrics/histograms/histograms.xml. - static const base::NoDestructor> -- upgradable_servers({ -+ upgradable_servers{{ - DohUpgradeEntry( - "CleanBrowsingAdult", - {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", -@@ -215,7 +215,7 @@ - {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"}, - {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */, - {"https://dns.quad9.net/dns-query", true /* use_post */}), -- }); -+ }}; - return *upgradable_servers; - } - diff --git a/www-client/chromium/files/chromium-79-gcc-name-clash.patch b/www-client/chromium/files/chromium-79-gcc-name-clash.patch deleted file mode 100644 index 2324f4db7f9..00000000000 --- a/www-client/chromium/files/chromium-79-gcc-name-clash.patch +++ /dev/null @@ -1,135 +0,0 @@ -From e925deab264e5ebc3c5c13415aa3d44a746e8d45 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Fri, 25 Oct 2019 14:53:51 +0000 -Subject: [PATCH] GCC: avoid clash of WebThemeEngine::ForcedColors with ForcedColors enum class - -GCC fails to build because the declaration of the enum class ForcedColors -clashes with the GetForcedColors method. - -Bug: 819294 -Change-Id: I5c7647978d15c771f5372a8c70ac6aeb2284fb2f -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879452 -Reviewed-by: Kentaro Hara -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#709469} - -(backported to M79) ---- - -diff --git a/content/child/webthemeengine_impl_android.cc b/content/child/webthemeengine_impl_android.cc -index 2e703d6..3759f6c 100644 ---- a/content/child/webthemeengine_impl_android.cc -+++ b/content/child/webthemeengine_impl_android.cc -@@ -228,7 +228,7 @@ void WebThemeEngineAndroid::Paint( - native_theme_extra_params, NativeColorScheme(color_scheme)); - } - --blink::ForcedColors WebThemeEngineAndroid::ForcedColors() const { -+blink::ForcedColors WebThemeEngineAndroid::GetForcedColors() const { - return forced_colors_; - } - -diff --git a/content/child/webthemeengine_impl_android.h b/content/child/webthemeengine_impl_android.h -index 0c113a88..95e2744 100644 ---- a/content/child/webthemeengine_impl_android.h -+++ b/content/child/webthemeengine_impl_android.h -@@ -22,7 +22,7 @@ - const blink::WebRect& rect, - const blink::WebThemeEngine::ExtraParams* extra_params, - blink::WebColorScheme color_scheme) override; -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/content/child/webthemeengine_impl_default.cc b/content/child/webthemeengine_impl_default.cc -index 84db298..04af6c6 100644 ---- a/content/child/webthemeengine_impl_default.cc -+++ b/content/child/webthemeengine_impl_default.cc -@@ -232,7 +232,7 @@ - } - #endif - --blink::ForcedColors WebThemeEngineDefault::ForcedColors() const { -+blink::ForcedColors WebThemeEngineDefault::GetForcedColors() const { - return ui::NativeTheme::GetInstanceForWeb()->UsesHighContrastColors() - ? blink::ForcedColors::kActive - : blink::ForcedColors::kNone; -diff --git a/content/child/webthemeengine_impl_default.h b/content/child/webthemeengine_impl_default.h -index 73579db..1f08f67 100644 ---- a/content/child/webthemeengine_impl_default.h -+++ b/content/child/webthemeengine_impl_default.h -@@ -39,7 +39,7 @@ - int32_t vertical_arrow_bitmap_height, - int32_t horizontal_arrow_bitmap_width); - #endif -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/content/child/webthemeengine_impl_mac.cc b/content/child/webthemeengine_impl_mac.cc -index 9cb279e..553eedb 100644 ---- a/content/child/webthemeengine_impl_mac.cc -+++ b/content/child/webthemeengine_impl_mac.cc -@@ -6,7 +6,7 @@ - - namespace content { - --blink::ForcedColors WebThemeEngineMac::ForcedColors() const { -+blink::ForcedColors WebThemeEngineMac::GetForcedColors() const { - return forced_colors_; - } - -diff --git a/content/child/webthemeengine_impl_mac.h b/content/child/webthemeengine_impl_mac.h -index b3dafa1..c0b66c0 100644 ---- a/content/child/webthemeengine_impl_mac.h -+++ b/content/child/webthemeengine_impl_mac.h -@@ -13,7 +13,7 @@ - public: - ~WebThemeEngineMac() override {} - -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/third_party/blink/public/platform/web_theme_engine.h b/third_party/blink/public/platform/web_theme_engine.h -index d642462..aa2da1b 100644 ---- a/third_party/blink/public/platform/web_theme_engine.h -+++ b/third_party/blink/public/platform/web_theme_engine.h -@@ -227,7 +227,7 @@ - return base::nullopt; - } - -- virtual ForcedColors ForcedColors() const { return ForcedColors::kNone; } -+ virtual ForcedColors GetForcedColors() const { return ForcedColors::kNone; } - virtual void SetForcedColors(const blink::ForcedColors forced_colors) {} - virtual blink::PreferredColorScheme PreferredColorScheme() const { - return PreferredColorScheme::kNoPreference; -diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc -index 045d793..f7c0484 100644 ---- a/third_party/blink/renderer/core/css/media_values.cc -+++ b/third_party/blink/renderer/core/css/media_values.cc -@@ -221,7 +221,7 @@ - - ForcedColors MediaValues::CalculateForcedColors() { - if (Platform::Current() && Platform::Current()->ThemeEngine()) -- return Platform::Current()->ThemeEngine()->ForcedColors(); -+ return Platform::Current()->ThemeEngine()->GetForcedColors(); - else - return ForcedColors::kNone; - } -diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 64b0d23..02cce1f 100644 ---- a/third_party/blink/renderer/core/dom/document.cc -+++ b/third_party/blink/renderer/core/dom/document.cc -@@ -8625,7 +8625,7 @@ - bool Document::InForcedColorsMode() const { - return RuntimeEnabledFeatures::ForcedColorsEnabled() && Platform::Current() && - Platform::Current()->ThemeEngine() && -- Platform::Current()->ThemeEngine()->ForcedColors() != -+ Platform::Current()->ThemeEngine()->GetForcedColors() != - ForcedColors::kNone; - } - diff --git a/www-client/chromium/files/chromium-79-gcc-permissive.patch b/www-client/chromium/files/chromium-79-gcc-permissive.patch deleted file mode 100644 index c42d56985a6..00000000000 --- a/www-client/chromium/files/chromium-79-gcc-permissive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 528e9a3e1f25bd264549c4c7779748abfd16bb1c Mon Sep 17 00:00:00 2001 -From: Jan Wilken Dörrie -Date: Fri, 18 Oct 2019 11:45:24 +0000 -Subject: [PATCH] Reland "GCC: Fix base::internal::InvokeFuncImpl" - -This is a reland of 9293d5c86eec1c34fc00716645400b44a14e764e - -Original change's description: -> GCC: Fix base::internal::InvokeFuncImpl -> -> GCC doesn't like that the Value data member has no out-of-line -> definition. The problem is triggered specifically only when compiling -> -> components/services/leveldb/leveldb_database_impl.cc -> -> which has lambda functions returning locally-defined classes. -> -> The current code works as-is in C++17 mode which introduces the concept -> of inline variables, but in C++14 we need either an explicit out-of-line -> definition or a function member instead of a data member. -> -> Use std::integral_constant for defining the value. -> -> Bug: 819294 -> Change-Id: I5c68e14ce3fa9d8b4d8a2cb42d7f9b53938aabf3 -> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862451 -> Reviewed-by: Jan Wilken Dörrie -> Reviewed-by: Daniel Cheng -> Commit-Queue: Jüri Valdmann -> Cr-Commit-Position: refs/heads/master@{#706384} - -Bug: 819294 -Change-Id: I3d5a52ddc6815516e2239f9347c60de06bf765a2 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865212 -Reviewed-by: Daniel Cheng -Commit-Queue: Jan Wilken Dörrie -Cr-Commit-Position: refs/heads/master@{#707329} ---- - -diff --git a/base/bind.h b/base/bind.h -index 7a400af..1070ce6 100644 ---- a/base/bind.h -+++ b/base/bind.h -@@ -187,18 +187,15 @@ - // well-formed. Using `Invoker::Run` with a OnceCallback triggers a - // static_assert, which is why the ternary expression does not compile. - // TODO(crbug.com/752720): Remove this indirection once we have `if constexpr`. --template --struct InvokeFuncImpl; -+template -+constexpr auto GetInvokeFunc(std::true_type) { -+ return Invoker::RunOnce; -+} - - template --struct InvokeFuncImpl { -- static constexpr auto Value = &Invoker::RunOnce; --}; -- --template --struct InvokeFuncImpl { -- static constexpr auto Value = &Invoker::Run; --}; -+constexpr auto GetInvokeFunc(std::false_type) { -+ return Invoker::Run; -+} - - template