commit: 8278e93ad8bd783f2eeaf9d93660134263226dc8 Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> AuthorDate: Thu Jan 5 12:36:04 2017 +0000 Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 12:38:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8278e93a
www-client/chromium: dev channel bump (57.0.2970.0) Fix build with system ICU, bug #602362 by floppym@ . www-client/chromium/Manifest | 2 +- ...0.2946.0.ebuild => chromium-57.0.2970.0.ebuild} | 42 +++++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index c53cfa8..cccf996 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-55.0.2883.75.tar.xz 511256096 SHA256 5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 SHA512 9830b02e05ebaf120b02b11114c67196ba5c7f2d5aa917b9e5f8516b1f0cce1abd8e752c379e8ac1f16c7b7e451341486d9356d47a1b77b72ab5117390ce16b9 WHIRLPOOL ab752b9e9a6c7a536424ac1384d9f0ad0f23dd40bbf6784e4185554602628e8e1f45acbb264fff33f7f00c8ee14f293bfaf23259d2db4f785c9c9c49e72b28eb DIST chromium-56.0.2924.18.tar.xz 513374276 SHA256 c68089d563348f41f40a606f583489853994adcd6b3329f24a10bf7a3ff292bc SHA512 fac070b0874f334cd874cea4b631f6701766c1bc30b5455daee9284f233fde1ed4f17f0666dc30c7dd6b4116a740a4e146dfdb15708a335a7701dc453c1df392 WHIRLPOOL a707a503daef0b43431ad11944597daabace44f3237ce22342b5f4b2d80c1a0724cbdf8e2fcbef3d7f2d111c4f4130189a423c2764071a7d4cba039225d8f712 DIST chromium-56.0.2924.21.tar.xz 513324284 SHA256 08330d147a9340c593ac0255adac30e189e1e9ed99c43d148891058365b4182a SHA512 acfc81177e5fdacc954cdc94b705079b8fdf19a7d90573b38b9a297eeb2d169325f460ce1ec14ea52cfa57782f818d733ece62c8ff313610730881efeba5afb7 WHIRLPOOL cc2ed9362aa5f88d05e884e46897b919020044d7556c5c4217ddd527cf198d84c87d9d48281aa4d4dae94dc06490657fdcf2d9c5653f9eea3a33767e5383eac6 -DIST chromium-57.0.2946.0.tar.xz 521168352 SHA256 4dc48ad4cd580ab25af4b73d8dff2e9dc1c628f76e4a7c02eb9566829e6289b5 SHA512 846cbba0b7185f9ed766f36922e146bb152173c4d647e87b267074c518974201e158e5dc14c9651ac50189e6fc91653fff08e37bad76c6185cd9c1bd622d2fdc WHIRLPOOL 48ec2028454cf762adfb1d2f44d183772d6267897f3140fbff971c96b5db3dd3722b889d57c28524b335b8e02bae22e7d4d8f945f3cd48caa37c6f0af5b1be5c DIST chromium-57.0.2950.4.tar.xz 521653320 SHA256 41a56ce7a89bfa0ee47039d18be1889781b78dfde88ad93ef19cabde20c5d8b6 SHA512 333848375a8fbeee0bb9249a1f978caea9800f40a84c149a20263a668a3921eb74ced2d2563bc67ba902838e8865a3b552f9c03e88ff2ce87e6d88807d3fcbaf WHIRLPOOL b9b9e06f766315d17c7414813312fd54fd223a4ab5a0d0ba21604a4e808cb5ad8d63d445fdf879d0f7ab82ebaa83fda0bf6f46433ed5055b999d09ae287d9044 +DIST chromium-57.0.2970.0.tar.xz 523656564 SHA256 7cb5255d352e729a637e4939fa2561266b709aa3c9ea66aeebd80af8672c27fb SHA512 c059b1d5f33614c82a50394ce25c8fbd1ce2bc5ad6f9956caa9f088e73158751ad11a642edc5ba71dd7a6e432a74a036b2125dd73f290825470a23b7bc609576 WHIRLPOOL 98a6ad75dc49a464f532648d900cf9c4f39587bf2621b157ee762a8b2db0c1fd627253903c4e6d91c031f82150d2e760f80ceac468f35ab41ebef8db7a311a84 diff --git a/www-client/chromium/chromium-57.0.2946.0.ebuild b/www-client/chromium/chromium-57.0.2970.0.ebuild similarity index 95% rename from www-client/chromium/chromium-57.0.2946.0.ebuild rename to www-client/chromium/chromium-57.0.2970.0.ebuild index aac3d5b..544178e 100644 --- a/www-client/chromium/chromium-57.0.2946.0.ebuild +++ b/www-client/chromium/chromium-57.0.2970.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="cups gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine" +IUSE="component-build cups gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -28,18 +28,16 @@ QA_FLAGS_IGNORED=".*\.nexe" # right tools for it, bug #469144 . QA_PRESTRIPPED=".*\.nexe" -# Bundled: -# dev-libs/icu:= -# dev-libs/libxml2:=[icu] -# dev-libs/libxslt:= -# >=media-libs/harfbuzz-1.3.1:=[icu(+)] COMMON_DEPEND=" app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= + dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= @@ -48,6 +46,7 @@ COMMON_DEPEND=" >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= + >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= @@ -164,13 +163,17 @@ PATCHES=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" "${FILESDIR}/${PN}-system-jinja-r14.patch" "${FILESDIR}/${PN}-widevine-r1.patch" - "${FILESDIR}/${PN}-gn-r10.patch" ) pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then + local -x CPP="$(tc-getCXX) -E" + if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then + # bugs: #601654 + die "At least clang 3.9.1 is required" + fi if tc-is-gcc && ! version_is_at_least 5 "$(gcc-major-version)"; then - # bugs: #535730, #525374, #518668 + # bugs: #535730, #525374, #518668, #600288 die "At least gcc 5 is required" fi fi @@ -314,12 +317,6 @@ src_prepare() { third_party/usb_ids third_party/xdg-utils third_party/yasm/run_yasm.py - - # M57 bundled - third_party/harfbuzz-ng - third_party/icu - third_party/libxslt - third_party/libxml ) if ! use system-ffmpeg; then keeplibs+=( third_party/ffmpeg ) @@ -335,6 +332,10 @@ src_configure() { # 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)" + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). myconf_gn+=" enable_nacl=false" @@ -350,14 +351,14 @@ src_configure() { # libevent: https://bugs.gentoo.org/593458 local gn_system_libraries=( flac - #harfbuzz-ng - #icu + harfbuzz-ng + icu libjpeg libpng libvpx libwebp - #libxml - #libxslt + libxml + libxslt re2 snappy yasm @@ -574,9 +575,10 @@ src_install() { insinto "${CHROMIUM_HOME}" doins out/Release/*.bin doins out/Release/*.pak + doins out/Release/*.so # Needed by bundled icu - doins out/Release/icudtl.dat + # doins out/Release/icudtl.dat doins -r out/Release/locales doins -r out/Release/resources
