From: Mike Gilbert Date: Sun, 23 Aug 2015 19:05:38 +0000 (-0400) Subject: www-client/chromium: Beta channel bump (45.0.2454.46) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c52c8a2affc853ebc820e8f9cdc9d110874eb414;p=gentoo.git www-client/chromium: Beta channel bump (45.0.2454.46) Package-Manager: portage-2.2.20_p134 --- diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 22326ff79855..ac084ba73666 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-44.0.2403.89.tar.xz 292891880 SHA256 badd9aa979487b55bbcce4f54ec16926c6fa7eb46ec2536866200a5e68853a98 SHA512 786923a45c6baaf309ac2fe43309d8b73e5fa7e97f918ec42449b6fefdf52bd9d544e77bc1332abdce0df645d9d564a58781619de4e67f7b0fc9afae37c141e0 WHIRLPOOL 4d31a80a1dfdd3b733199412e1429ce36eeb4f1e60f31401e9e8bb2163d9d4b24b700ce26ec53f82f6b0f4bbca023737ca92e4e494397d55ab6fa20793078caf -DIST chromium-45.0.2454.15-lite.tar.xz 240663492 SHA256 acb19ec9b6ce608e5ad9dfda9dea01e8b11993cb6490eecc28ffc7ea7460f48f SHA512 d1d46ec5ea0a3d316187ad02d4e2f819e91720b5a6586a463888e9d853642346dcca3802a84a91b084b412cc1920eac53a90dfca8e5fc02ce23ad2b2da02c226 WHIRLPOOL aa9615e781abf973a531208f7791835a83ba407305f24f089f64c5a0f54de43e4198876f33b6231f9eb4aa8e8ec8b7765a472e1c78bbe8c57795dd1ec642e2cd DIST chromium-45.0.2454.37-lite.tar.xz 241008104 SHA256 aff447d94f5a8634515b7024a52f1426665c77d5d7c78eb69319dd2a366f4681 SHA512 6a7139c4e9ec31d94aeceb6754e4f0af0c23a2bd3a42f96bf65478c9d36279217599142b58a93ffe7d2ef8d150342b8c431af3357722591cf7ff4e768c1be80e WHIRLPOOL be7d373c1600d864b627c44d9b99ccb1eac9eb3f04535fb5808a7d0ceddd299b127b812df4333de438140b8840c63bdfb2842d9a2dfe006f0c212f9ca411df8f +DIST chromium-45.0.2454.46-lite.tar.xz 242538392 SHA256 0bcab2fa404cf5b8192fa1cecf239b6c0c53b536b7deccd08b722a8732d31b9f SHA512 a318624b716f189ff701c0835b2cdc42b49a651fbe8907d969db23c38c2b8dc7152bea919fa0879cbeaebcae58542327409643f382cac31aac046dba436ed53e WHIRLPOOL 3ca0c4c1ea02d24f661fa3f5ffbece198afe1bd07cc42edf93aea406a385972f7f8a576f5a9a0ed99abb396ee142485e8f893955f8085baf1fd94b5d2d9b9ae2 DIST chromium-46.0.2478.0-lite.tar.xz 247599924 SHA256 cf6e4cbae48b6330483d4f2da734dc666d58c8e88051e2f622b26230841328b0 SHA512 b60998b9a5c847827b86b45069924edb805e665e3161fb4d80d842b2d43941d100a7a4d401f13cc0060290bf65c0246fd0fc298a270ba783329a650f607d0027 WHIRLPOOL e26d7733de07952c18bd0d7d3e02626f1dc26a900986ff92e39926096416f6cad96108ad6348218bd4116077cad491e608c445be1a59f5d7764128948d03f582 DIST chromium-46.0.2486.0-lite.tar.xz 258526052 SHA256 9a1241b712501d8e73d74ff436b74fdf707a60d0f5f9e2ac48c2330965a4acc7 SHA512 bca079598d4ce4116d0d4be519e635079c41bc2aa0ab89699b23687ce2edd819f14df9bc509e4fa9ade5658f527984ee51a0fa651eec5eb81fbaffcc94196e7f WHIRLPOOL e905b36d47bad712e82bcda39d03dbf9c68c21bf25c99c974e8135f67a3fb8c9849d5cb96d291114c256019b35d680bba75d5d4cd4527f37ee9df282b510fe77 diff --git a/www-client/chromium/chromium-45.0.2454.15.ebuild b/www-client/chromium/chromium-45.0.2454.15.ebuild deleted file mode 100644 index 73f4fa60dd5e..000000000000 --- a/www-client/chromium/chromium-45.0.2454.15.ebuild +++ /dev/null @@ -1,630 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA 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 eutils flag-o-matic multilib multiprocessing pax-utils \ - portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz" - -LICENSE="BSD hotwording? ( no-source-code )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc" -RESTRICT="proprietary-codecs? ( bindist )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= - app-arch/bzip2:= - app-arch/snappy:= - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/icu-55.1:= - >=dev-libs/jsoncpp-0.5.0-r1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - dev-libs/re2:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/flac:= - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/harfbuzz:=[icu(+)] - media-libs/libexif:= - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - media-libs/speex:= - net-libs/libsrtp:= - pulseaudio? ( media-sound/pulseaudio:= ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - x11-libs/gtk+:2= - x11-libs/libdrm - 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/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - !=www-client/chromium-9999 - ! "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libsrtp=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_re2=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use hidpi enable_hidpi) - $(gyp_use hotwording enable_hotwording) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf+=" -Dclang=1" - else - myconf+=" -Dclang=0" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_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. - myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf+=" -Darmv7=1" - else - myconf+=" -Darmv7=0" - fi - myconf+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf+=" -Dtarget_arch=${target_arch}" - - # 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+=" -Dwerror=" - - # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" - - # 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-avx2 - fi - fi - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Tools for building programs to be executed on the build system, bug #410883. - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export LD_host=${CXX_host} - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -m 755 "${TMPDIR}" || die - - 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_gyp.py || die - popd > /dev/null || die - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - einfo "Configuring Chromium..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - egyp_chromium ${myconf} || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="chrome chrome_sandbox chromedriver" - - # Build mksnapshot and pax-mark it. - eninja -C out/Release mksnapshot || die - pax-mark m out/Release/mksnapshot - - # 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 ${ninja_targets} || die - - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - newexe out/Release/chrome_sandbox chrome-sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - doexe out/Release/chromedriver || die - - # if ! use arm; then - # doexe out/Release/nacl_helper{,_bootstrap} || die - # insinto "${CHROMIUM_HOME}" - # doins out/Release/nacl_irt_*.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # fi - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - if [[ -n ${CHROMIUM_SUFFIX} ]]; then - sedargs+=( - -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" - -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" - -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" - ) - fi - 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${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin || die - doins out/Release/*.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 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${CHROMIUM_SUFFIX}.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_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "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). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-45.0.2454.15-r1.ebuild b/www-client/chromium/chromium-45.0.2454.46.ebuild similarity index 100% rename from www-client/chromium/chromium-45.0.2454.15-r1.ebuild rename to www-client/chromium/chromium-45.0.2454.46.ebuild