From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7A433198005 for ; Mon, 4 Mar 2013 20:31:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08571E089E; Mon, 4 Mar 2013 20:31:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82D14E089E for ; Mon, 4 Mar 2013 20:31:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A7BF33BF3E for ; Mon, 4 Mar 2013 20:31:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 420D12171D; Mon, 4 Mar 2013 20:31:07 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-25.0.1364.152.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: chromium-25.0.1364.152.ebuild ChangeLog X-VCS-Directories: www-client/chromium X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130304203107.420D12171D@flycatcher.gentoo.org> Date: Mon, 4 Mar 2013 20:31:07 +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-Archives-Salt: d5554f8b-080a-4f38-a011-c779b7e2a0d1 X-Archives-Hash: b91ce57c1d8446658ee051806c71ed0d floppym 13/03/04 20:31:07 Modified: ChangeLog Added: chromium-25.0.1364.152.ebuild Log: Stable channel bump. Use bundled libsrtp for bug 459932. (Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) Revision Changes Path 1.826 www-client/chromium/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.826&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.826&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.825&r2=1.826 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v retrieving revision 1.825 retrieving revision 1.826 diff -u -r1.825 -r1.826 --- ChangeLog 4 Mar 2013 01:53:16 -0000 1.825 +++ ChangeLog 4 Mar 2013 20:31:07 -0000 1.826 @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.825 2013/03/04 01:53:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.826 2013/03/04 20:31:07 floppym Exp $ + +*chromium-25.0.1364.152 (04 Mar 2013) + + 04 Mar 2013; Mike Gilbert +chromium-25.0.1364.152.ebuild: + Stable channel bump. Use bundled libsrtp for bug 459932. 04 Mar 2013; Mike Gilbert files/chromium-mesa-r0.patch, files/chromium-mesa-r1.patch: 1.1 www-client/chromium/chromium-25.0.1364.152.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-25.0.1364.152.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-25.0.1364.152.ebuild?rev=1.1&content-type=text/plain Index: chromium-25.0.1364.152.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.152.ebuild,v 1.1 2013/03/04 20:31:07 floppym Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" 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 chromium eutils flag-o-matic multilib \ pax-utils portability python 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.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc" RDEPEND="app-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.15.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 dev-libs/protobuf gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0 ) sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux )" DEPEND="${RDEPEND} !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib )" RDEPEND+=" !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts" if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi pkg_setup() { if [[ "${SLOT}" == "0" ]]; then CHROMIUM_SUFFIX="" else CHROMIUM_SUFFIX="-${SLOT}" fi CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" # Make sure the build system will use the right tools, bug #340795. tc-export AR CC CXX RANLIB # Make sure the build system will use the right python, bug #344367. python_set_active_version 2 python_pkg_setup if ! use selinux; then chromium_suid_sandbox_check_kernel_config fi if use bindist && ! use system-ffmpeg; then elog "bindist enabled: H.264 video support will be disabled." fi if ! use bindist; then elog "bindist disabled: Resulting binaries may not be legal to re-distribute." fi } src_prepare() { if ! use arm; then ebegin "Preparing NaCl newlib toolchain" pushd "${T}" >/dev/null || die mkdir sdk || die cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die mkdir -p "${S}"/native_client/toolchain/.tars || die tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die popd >/dev/null || die eend $? fi # Fix build without NaCl glibc toolchain. epatch "${FILESDIR}/${PN}-ppapi-r0.patch" # Fix build without NaCl pnacl toolchain. epatch "${FILESDIR}/${PN}-no-pnacl-r0.patch" # Backport a fix for libpng shim headers. epatch "${FILESDIR}/${PN}-system-libpng-r0.patch" # Fix build with system opus, bug #439884. epatch "${FILESDIR}/${PN}-system-opus-r0.patch" # Backport fix for test expectations, bug #444886. epatch "${FILESDIR}/${PN}-icu50-tests-r0.patch" # Missing gyp files in tarball. # https://code.google.com/p/chromium/issues/detail?id=144823 if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then die "tarball fixed, please remove workaround" fi mkdir -p chrome/test/data/nacl cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF { 'targets': [ { 'target_name': 'nacl_tests', 'type': 'none', }, ], } EOF epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch" epatch_user # Remove most bundled libraries. Some are still needed. find third_party -type f \! -iname '*.gyp*' \ \! -path 'third_party/WebKit/*' \ \! -path 'third_party/angle/*' \ \! -path 'third_party/cacheinvalidation/*' \ \! -path 'third_party/cld/*' \ \! -path 'third_party/cros_system_api/*' \ \! -path 'third_party/ffmpeg/*' \ \! -path 'third_party/flac/flac.h' \ \! -path 'third_party/flot/*' \ \! -path 'third_party/gpsd/*' \ \! -path 'third_party/hunspell/*' \ \! -path 'third_party/hyphen/*' \ \! -path 'third_party/iccjpeg/*' \ \! -path 'third_party/jsoncpp/*' \ \! -path 'third_party/khronos/*' \ \! -path 'third_party/leveldatabase/*' \ \! -path 'third_party/libjingle/*' \ \! -path 'third_party/libphonenumber/*' \ \! -path 'third_party/libsrtp/*' \ \! -path 'third_party/libusb/libusb.h' \ \! -path 'third_party/libvpx/libvpx.h' \ \! -path 'third_party/libxml/chromium/*' \ \! -path 'third_party/libXNVCtrl/*' \ \! -path 'third_party/libyuv/*' \ \! -path 'third_party/lss/*' \ \! -path 'third_party/mesa/*' \ \! -path 'third_party/modp_b64/*' \ \! -path 'third_party/mongoose/*' \ \! -path 'third_party/mt19937ar/*' \ \! -path 'third_party/npapi/*' \ \! -path 'third_party/openmax/*' \ \! -path 'third_party/opus/opus.h' \ \! -path 'third_party/ots/*' \ \! -path 'third_party/pywebsocket/*' \ \! -path 'third_party/qcms/*' \ \! -path 'third_party/re2/*' \ \! -path 'third_party/scons-2.0.1/*' \ \! -path 'third_party/sfntly/*' \ \! -path 'third_party/skia/*' \ \! -path 'third_party/smhasher/*' \ \! -path 'third_party/speex/speex.h' \ \! -path 'third_party/sqlite/*' \ \! -path 'third_party/tcmalloc/*' \ \! -path 'third_party/tlslite/*' \ \! -path 'third_party/trace-viewer/*' \ \! -path 'third_party/undoview/*' \ \! -path 'third_party/v8-i18n/*' \ \! -path 'third_party/webdriver/*' \ \! -path 'third_party/webgl_conformance/*' \ \! -path 'third_party/webrtc/*' \ \! -path 'third_party/widevine/*' \ \! -path 'third_party/x86inc/*' \ -delete || die # Remove bundled v8. find v8 -type f \! -iname '*.gyp*' -delete || die # The implementation files include v8 headers with full path, # like #include "v8/include/v8.h". Make sure the system headers # will be used. # TODO: find a solution that can be upstreamed. rmdir v8/include || die ln -s /usr/include v8/include || die } src_configure() { local myconf="" # Never tell the build system to "enable" SSE2, it has a few unexpected # additions, bug #336871. myconf+=" -Ddisable_sse2=1" # Optional tcmalloc. Note it causes problems with e.g. NVIDIA # drivers, bug #413637. myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" # Disable glibc Native Client toolchain, we don't need it (bug #417019). myconf+=" -Ddisable_glibc=1" # TODO: also build with pnacl myconf+=" -Ddisable_pnacl=1" # Make it possible to remove third_party/adobe. echo > "${T}/flapper_version.h" || die myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" # Use system-provided libraries. # TODO: use_system_ffmpeg # TODO: use_system_hunspell (upstream changes needed). # 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_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libsrtp=0 -Duse_system_libusb=1 -Duse_system_libvpx=1 -Duse_system_libwebp=1 -Duse_system_libxml=1 -Duse_system_minizip=1 -Duse_system_opus=1 -Duse_system_protobuf=1 -Duse_system_speex=1 -Duse_system_v8=1 -Duse_system_xdg_utils=1 -Duse_system_yasm=1 -Duse_system_zlib=1 $(gyp_use system-ffmpeg use_system_ffmpeg)" # 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 kerberos) $(gyp_use pulseaudio) $(gyp_use selinux selinux)" # 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" # TODO: use the file at run time instead of effectively compiling it in. myconf+=" -Dusb_ids_path=/usr/share/misc/usb.ids" if ! use selinux; then # Enable SUID sandbox. myconf+=" -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" fi # Never use bundled gold binary. Disable gold linker flags for now. myconf+=" -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0" if ! use bindist && ! use system-ffmpeg; then # Enable H.624 support in bundled ffmpeg. myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" fi # 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 myconf+=" -Dtarget_arch=x64" elif [[ $myarch = x86 ]] ; then myconf+=" -Dtarget_arch=ia32" elif [[ $myarch = arm ]] ; then # TODO: re-enable NaCl (NativeClient). myconf+=" -Dtarget_arch=arm -Darmv7=0 -Darm_neon=0 -Ddisable_nacl=1" 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+=" -Dwerror=" # Avoid CFLAGS problems, bug #352457, bug #390147. if ! use custom-cflags; then replace-flags "-Os" "-O2" strip-flags fi egyp_chromium ${myconf} || die } src_compile() { local test_targets for x in base cacheinvalidation crypto \ googleurl gpu media net printing sql; do test_targets+=" ${x}_unittests" done local make_targets="chrome chromedriver" if ! use selinux; then make_targets+=" chrome_sandbox" fi if use test; then make_targets+=$test_targets fi # See bug #410883 for more info about the .host mess. emake ${make_targets} BUILDTYPE=Release V=1 \ CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ AR.host="$(tc-getAR)" || die pax-mark m out/Release/chrome if use test; then for x in $test_targets; do pax-mark m out/Release/${x} done fi } src_test() { # For more info see bug #350349. local mylocale='en_US.utf8' if ! locale -a | grep -q "$mylocale"; then eerror "${PN} requires ${mylocale} locale for tests" eerror "Please read the following guides for more information:" eerror " http://www.gentoo.org/doc/en/guide-localization.xml" eerror " http://www.gentoo.org/doc/en/utf-8.xml" die "locale ${mylocale} is not supported" fi # For more info see bug #370957. if [[ $UID -eq 0 ]]; then die "Tests must be run as non-root. Please use FEATURES=userpriv." fi runtest() { local cmd=$1 shift local filter="--gtest_filter=$(IFS=:; echo "-${*}")" einfo "${cmd}" "${filter}" LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" } local excluded_base_unittests=( "ICUStringConversionsTest.*" # bug #350347 "MessagePumpLibeventTest.*" # bug #398591 ) runtest out/Release/base_unittests "${excluded_base_unittests[@]}" runtest out/Release/cacheinvalidation_unittests runtest out/Release/crypto_unittests runtest out/Release/googleurl_unittests runtest out/Release/gpu_unittests # TODO: re-enable when we get the test data in a separate tarball. # runtest out/Release/media_unittests # local excluded_net_unittests=( # "NetUtilTest.IDNToUnicode*" # bug 361885 # "NetUtilTest.FormatUrl*" # see above # "DnsConfigServiceTest.GetSystemConfig" # bug #394883 # "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 # "URLFetcher*" # bug #425764 # "HTTPSOCSPTest.*" # bug #426630 # "HTTPSEVCRLSetTest.*" # see above # "HTTPSCRLSetTest.*" # see above #) # runtest out/Release/net_unittests "${excluded_net_unittests[@]}" runtest out/Release/printing_unittests runtest out/Release/sql_unittests } src_install() { exeinto "${CHROMIUM_HOME}" doexe out/Release/chrome || die if ! use selinux; then doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" fi 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 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die fi # 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 # 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/*.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 if ! use system-ffmpeg; then doexe out/Release/libffmpegsumo.so || die fi # 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 }