mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
www-client/chromium: dev channel bump to 80.0.3962.2
Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann <stha09@googlemail.com> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
committed by
Mike Gilbert
parent
b828351552
commit
351dbb27ec
@@ -2,3 +2,4 @@ DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9a
|
||||
DIST chromium-78.0.3904.87.tar.xz 742861696 BLAKE2B f8e99207876d879dc74873950e3647d41f0c687a9cd6285f44d54a4c39ceac68d455a79c38f0c9c4815ad025b2b6fae95305f0bc47e2d4c0f2937810068ffe1e SHA512 9c59c01c7224771dd1db648a8cea6cda646062b4b172eb7bf0767a0b5ebead038697a8c0ec2c4ef758b876bb7a1c862223b8ef3c23308fd0c99752444305a713
|
||||
DIST chromium-78.0.3904.97.tar.xz 742793812 BLAKE2B e7fada913f5831d805a50445da41ecbca7e27af52574ce242f427c0e4c83a74ae0283eb1667d74d39eb88f05e88e5a389945628666e24e26d635f74c43c8bc55 SHA512 e29312fe5c15eb6888a2e4d7e197c710d53feeecdf4e534c59f3db26973fee13f48880b46a7c3b132bb9989eb617db9c6138b809c3cb762332a9db25ad6d33dc
|
||||
DIST chromium-79.0.3945.29.tar.xz 778087092 BLAKE2B 5ebf337a5510e78cf52e317fa1080f2714be09a8514ec1b9188fbf195efb36016a4588eaba769e6ead0502fa2dadcddb9ccde51c313ad5dc99c92c0d18f92076 SHA512 8044996d23d05751b27ce7b01a1728149bf878b884a59bd039c4989a5b5c0ea0872733ffffc70e6908d45861a43ae7d18895718df3d38890c583fe222b65f1b5
|
||||
DIST chromium-80.0.3962.2.tar.xz 788407196 BLAKE2B f7ece5f654f7b479ac4aad42e18dc2454c46b39353bdf6057c30aeb30714f033af21228269510ddd4ebb15b570987cdbe0d0ae67824368f205fbdb9308cbed07 SHA512 29460df7e6b8f4b01fea06faad236690739e250170c190ee991090fc300a3cbea034ebee50731485ac578d5f8c83cfc86e9438bd6ba91c686f17bea78dbf1e86
|
||||
|
||||
736
www-client/chromium/chromium-80.0.3962.2.ebuild
Normal file
736
www-client/chromium/chromium-80.0.3962.2.ebuild
Normal file
@@ -0,0 +1,736 @@
|
||||
# Copyright 2009-2019 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}
|
||||
!<www-plugins/chrome-binary-plugins-57
|
||||
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
|
||||
!arm? (
|
||||
dev-lang/yasm
|
||||
)
|
||||
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
|
||||
closure-compile? ( virtual/jre )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
: ${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.
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/chromium-compiler-r10.patch"
|
||||
"${FILESDIR}/chromium-fix-char_traits.patch"
|
||||
"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
|
||||
"${FILESDIR}/chromium-77-system-icu.patch"
|
||||
"${FILESDIR}/chromium-78-protobuf-export.patch"
|
||||
"${FILESDIR}/chromium-79-gcc-alignas.patch"
|
||||
"${FILESDIR}/chromium-80-unbundle-libxml.patch"
|
||||
"${FILESDIR}/chromium-80-gcc-noexcept.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/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/third_party
|
||||
third_party/dom_distiller_js
|
||||
third_party/emoji-segmenter
|
||||
third_party/flatbuffers
|
||||
third_party/flot
|
||||
third_party/freetype
|
||||
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/sfntly
|
||||
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/gif
|
||||
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/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 )
|
||||
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
|
||||
}
|
||||
48
www-client/chromium/files/chromium-80-gcc-noexcept.patch
Normal file
48
www-client/chromium/files/chromium-80-gcc-noexcept.patch
Normal file
@@ -0,0 +1,48 @@
|
||||
From a75a2539ca600163f2136776fdc751111e887cd7 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||
Date: Tue, 05 Nov 2019 17:57:52 +0100
|
||||
Subject: [PATCH] GCC: do not set noexcept on move assignment operator of ColorSet
|
||||
|
||||
GCC build is broken because ColorSet default move assign operator is
|
||||
noexcept (because the color flat_map is not noexcept). It does not
|
||||
break clang because clang does not warn about this situation when
|
||||
building with -fno-exception.
|
||||
|
||||
../../ui/color/color_set.cc:14:11: error: function ‘ui::ColorSet& ui::ColorSet::operator=(ui::ColorSet&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’
|
||||
ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
|
||||
|
||||
Bug: 819294
|
||||
Change-Id: I00f4374fbf3d41dced9f9451c90478db528cb986
|
||||
---
|
||||
|
||||
diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc
|
||||
index 56564d7..0d43b2b 100644
|
||||
--- a/ui/color/color_set.cc
|
||||
+++ b/ui/color/color_set.cc
|
||||
@@ -9,9 +9,9 @@
|
||||
ColorSet::ColorSet(ColorSetId id, ColorMap&& colors)
|
||||
: id(id), colors(std::move(colors)) {}
|
||||
|
||||
-ColorSet::ColorSet(ColorSet&&) noexcept = default;
|
||||
+ColorSet::ColorSet(ColorSet&&) = default;
|
||||
|
||||
-ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
|
||||
+ColorSet& ColorSet::operator=(ColorSet&&) = default;
|
||||
|
||||
ColorSet::~ColorSet() = default;
|
||||
|
||||
diff --git a/ui/color/color_set.h b/ui/color/color_set.h
|
||||
index b273c48..3eaea42 100644
|
||||
--- a/ui/color/color_set.h
|
||||
+++ b/ui/color/color_set.h
|
||||
@@ -28,8 +28,8 @@
|
||||
using ColorMap = base::flat_map<ColorId, SkColor>;
|
||||
|
||||
ColorSet(ColorSetId id, ColorMap&& colors);
|
||||
- ColorSet(ColorSet&&) noexcept;
|
||||
- ColorSet& operator=(ColorSet&&) noexcept;
|
||||
+ ColorSet(ColorSet&&);
|
||||
+ ColorSet& operator=(ColorSet&&);
|
||||
~ColorSet();
|
||||
|
||||
ColorSetId id;
|
||||
101
www-client/chromium/files/chromium-80-unbundle-libxml.patch
Normal file
101
www-client/chromium/files/chromium-80-unbundle-libxml.patch
Normal file
@@ -0,0 +1,101 @@
|
||||
diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn
|
||||
index c481bd3..3aaa1a4 100644
|
||||
--- a/build/linux/unbundle/libxml.gn
|
||||
+++ b/build/linux/unbundle/libxml.gn
|
||||
@@ -8,11 +8,52 @@ pkg_config("system_libxml") {
|
||||
packages = [ "libxml-2.0" ]
|
||||
}
|
||||
|
||||
-static_library("libxml") {
|
||||
+source_set("libxml") {
|
||||
+ public_configs = [ ":system_libxml" ]
|
||||
+}
|
||||
+
|
||||
+static_library("libxml_utils") {
|
||||
+ # Do not expand this visibility list without first consulting with the
|
||||
+ # Security Team.
|
||||
+ visibility = [
|
||||
+ ":xml_reader",
|
||||
+ ":xml_writer",
|
||||
+ "//base/test:test_support",
|
||||
+ "//services/data_decoder:xml_parser_fuzzer",
|
||||
+ ]
|
||||
sources = [
|
||||
"chromium/libxml_utils.cc",
|
||||
"chromium/libxml_utils.h",
|
||||
]
|
||||
-
|
||||
public_configs = [ ":system_libxml" ]
|
||||
}
|
||||
+
|
||||
+static_library("xml_reader") {
|
||||
+ # Do not expand this visibility list without first consulting with the
|
||||
+ # Security Team.
|
||||
+ visibility = [
|
||||
+ "//base/test:test_support",
|
||||
+ "//components/policy/core/common:unit_tests",
|
||||
+ "//services/data_decoder:*",
|
||||
+ "//tools/traffic_annotation/auditor:auditor_sources",
|
||||
+ ]
|
||||
+ sources = [
|
||||
+ "chromium/xml_reader.cc",
|
||||
+ "chromium/xml_reader.h",
|
||||
+ ]
|
||||
+ deps = [
|
||||
+ ":libxml_utils",
|
||||
+ ]
|
||||
+}
|
||||
+
|
||||
+static_library("xml_writer") {
|
||||
+ # The XmlWriter is considered safe to use from any target.
|
||||
+ visibility = [ "*" ]
|
||||
+ sources = [
|
||||
+ "chromium/xml_writer.cc",
|
||||
+ "chromium/xml_writer.h",
|
||||
+ ]
|
||||
+ deps = [
|
||||
+ ":libxml_utils",
|
||||
+ ]
|
||||
+}
|
||||
diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h
|
||||
index ff969fa..e0f3ecd 100644
|
||||
--- a/third_party/libxml/chromium/libxml_utils.h
|
||||
+++ b/third_party/libxml/chromium/libxml_utils.h
|
||||
@@ -6,8 +6,7 @@
|
||||
#define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_
|
||||
|
||||
#include <string>
|
||||
-
|
||||
-#include "third_party/libxml/src/include/libxml/xmlreader.h"
|
||||
+#include <libxml/xmlreader.h>
|
||||
|
||||
// libxml uses a global error function pointer for reporting errors.
|
||||
// A ScopedXmlErrorFunc object lets you change the global error pointer
|
||||
diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc
|
||||
index 92464f4..4779290 100644
|
||||
--- a/third_party/libxml/chromium/xml_reader.cc
|
||||
+++ b/third_party/libxml/chromium/xml_reader.cc
|
||||
@@ -7,7 +7,8 @@
|
||||
#include <vector>
|
||||
|
||||
#include "third_party/libxml/chromium/libxml_utils.h"
|
||||
-#include "third_party/libxml/src/include/libxml/xmlreader.h"
|
||||
+
|
||||
+#include <libxml/xmlreader.h>
|
||||
|
||||
using internal::XmlStringToStdString;
|
||||
|
||||
diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc
|
||||
index 51fce8e..aa3a34f 100644
|
||||
--- a/third_party/libxml/chromium/xml_writer.cc
|
||||
+++ b/third_party/libxml/chromium/xml_writer.cc
|
||||
@@ -5,7 +5,8 @@
|
||||
#include "third_party/libxml/chromium/xml_writer.h"
|
||||
|
||||
#include "third_party/libxml/chromium/libxml_utils.h"
|
||||
-#include "third_party/libxml/src/include/libxml/xmlwriter.h"
|
||||
+
|
||||
+#include <libxml/xmlwriter.h>
|
||||
|
||||
XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {}
|
||||
|
||||
Reference in New Issue
Block a user