summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-09-23 09:04:37 -0400
committerMike Gilbert <floppym@gentoo.org>2016-09-23 09:05:02 -0400
commit2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b (patch)
tree3e91d135052b6bfd4c8b5fd1475c7fadfd7a1386 /www-client
parentmedia-video/mpv-0.18.0-r1: add alpha keyword (diff)
downloadgentoo-2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b.tar.gz
gentoo-2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b.tar.bz2
gentoo-2de0f5e4ffeb46a478c589b21d5bbcfd5736e57b.zip
www-client/chromium: beta channel bump (54.0.2840.34)
Package-Manager: portage-2.3.0_p43
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-54.0.2840.34.ebuild (renamed from www-client/chromium/chromium-54.0.2840.16.ebuild)10
2 files changed, 7 insertions, 5 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0aa8b094596b..6638750b4ac4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-53.0.2785.116.tar.xz 460903264 SHA256 7a87629504346f64122ca7754574d187a4c1bf5736dea672ff3e247a0af16062 SHA512 3a88b5b61642c4b947ae9cd9faa6d9d75fecfd6058982e705d36f1da2e94b902fb6d0af5289e00bbd0e5e7d096d5f5a788132c6e4374978620d6f7a1e2fb00da WHIRLPOOL fa067c68b217d494e16dfc78d63482a31006234ebae1c686426f011afde41a58d6939e3c5ee3a340ee099d5d88016f425b97e9f68957bb60d9b846d471702ac3
-DIST chromium-54.0.2840.16.tar.xz 479459252 SHA256 ba869ffc64ccd4cc16d844e76da71ae62f1c3fb32f55cd1d153ee386b59940af SHA512 b11e10b409d48d0e7edf6ddefc080c6776feb0cd238afe08fad8b06dcbc87c88ae5fcb369760fdcf35805060a42dfd13eaabec5c5f3b6ec95df51da34913a391 WHIRLPOOL 88a27dc0545fa14ac88f8d157c0cc3ec6739d348df6055435d369706fa2d62c60dd34941c49c6489ce279298501757f9a3a9981f92740cd6c58b938f58291438
DIST chromium-54.0.2840.27.tar.xz 479647448 SHA256 75e195afbb9f0c3e69b637ef4fa34ba7e5b3e62e871ba1b60638d9e9c5eee088 SHA512 3ba86ec5418aa0d338e8cfd935e8e6664679721ee208dd560d00ff011610094bed03ed0d76e1bc478d6bb92db5074e71f3e4bbeb1a41bb0ae21927b4dd74865c WHIRLPOOL 383de90421b1d23eee7bc7030e9e9bfeeeccf2639681b5219a3b3d865ef1568a65d8fae41a0864ddbe7c7980cd90df11a5d2bb8e93f705f906ec8a742b158fa6
+DIST chromium-54.0.2840.34.tar.xz 479636320 SHA256 b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 SHA512 23732e02ed30eaf36a4a4ee7bbb1af72c4202e061444004b515f0c49a578907719de3588f6d1e8dbb756cffa0220b677c920dc2f5ad6e8ec70a82168c094c99d WHIRLPOOL 822b41231a41aaeb8fc45ddc927c731535640a844ad25256a3f3daa86916c7cd9a5b79b30324c22efff03ef16a033b77d93df24f1ebf64df9373f77a8669fb41
DIST chromium-55.0.2853.0.tar.xz 501960780 SHA256 f6cff02888c5a781f29ece91df38c874a2245f3e12495cbdb49c141db211835a SHA512 4963f9aa3b965845c518b6565f8b1494ef59ec090c3d9b559cb01ddbb883dbc421d72dac6f6a652fea484821096a0ce2ccc4370818a74803d29aebdfbf956efd WHIRLPOOL 0b8469540a0a952483629ee87f90368d4597fbb82ba532edc1b6d7f5670e3155bb822b5f30a1764d9c547ac71260ee0cb44328c9d6320b2ab331f1661dd948c6
DIST chromium-55.0.2859.0.tar.xz 501623820 SHA256 43c343096377195500b31ff97979883a2e6d34e30f3f76e7d6af45679696aa38 SHA512 11bee1761c4e27576ada7e6aae65a021001f1873091acc4f8f8c38e97fbd2fc303ce37788a166736008dba761c7dcbd105f0be9df1b0513dc5ff67af24a8188f WHIRLPOOL efcb483c81175a942cfcc5edcbcf335b63e06de233ad731d60a85201b76123d23ab23930a926a4929958ef02ae935a9bd0ef625fce665831acc98047724e9488
diff --git a/www-client/chromium/chromium-54.0.2840.16.ebuild b/www-client/chromium/chromium-54.0.2840.34.ebuild
index b45ea2169cee..89048ea8ed5c 100644
--- a/www-client/chromium/chromium-54.0.2840.16.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.34.ebuild
@@ -73,7 +73,6 @@ COMMON_DEPEND="
x11-libs/libXtst:=
x11-libs/pango:=
app-arch/snappy:=
- >=dev-libs/libevent-1.4.13:=
dev-libs/libxml2:=[icu]
dev-libs/libxslt:=
media-libs/flac:=
@@ -83,6 +82,7 @@ COMMON_DEPEND="
kerberos? ( virtual/krb5 )
!gn? (
>=app-accessibility/speech-dispatcher-0.8:=
+ >=dev-libs/libevent-1.4.13:=
)
"
# For nvidia-drivers blocker, see bug #413637 .
@@ -365,10 +365,10 @@ src_configure() {
-Duse_system_xdg_utils=1
-Duse_system_zlib=1"
+ # libevent: https://bugs.gentoo.org/593458
local gn_system_libraries="
flac
harfbuzz-ng
- libevent
libjpeg
libpng
libvpx
@@ -407,7 +407,6 @@ src_configure() {
$(gyp_use tcmalloc use_allocator tcmalloc none)
$(gyp_use widevine enable_widevine)"
- # TODO: support USE=gnome-keyring for GN
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)"
@@ -452,7 +451,7 @@ src_configure() {
-Dlinux_use_gold_flags=0
-Dsysroot="
# Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false"
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
@@ -537,6 +536,9 @@ src_configure() {
# Make sure the build system will use the right tools, bug #340795.
tc-export AR CC CXX NM
+ # Define a custom toolchain for GN
+ myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
# Tools for building programs to be executed on the build system, bug #410883.
if tc-is-cross-compiler; then
export AR_host=$(tc-getBUILD_AR)