From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFKh9-0004GF-4A for garchives@archives.gentoo.org; Thu, 28 Apr 2011 06:27:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 843E81C048; Thu, 28 Apr 2011 06:27:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2CD621C048 for ; Thu, 28 Apr 2011 06:27:15 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 628312AC016 for ; Thu, 28 Apr 2011 06:27:14 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2261) id 01C6720054; Thu, 28 Apr 2011 06:27:12 +0000 (UTC) From: "PaweA Hajdan (phajdan.jr)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, phajdan.jr@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-12.0.742.9-r1.ebuild ChangeLog chromium-9999-r1.ebuild chromium-12.0.742.9.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: chromium-12.0.742.9-r1.ebuild ChangeLog chromium-9999-r1.ebuild chromium-12.0.742.9.ebuild X-VCS-Directories: www-client/chromium X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: PaweA Hajdan Content-Type: text/plain; charset=utf8 Message-Id: <20110428062713.01C6720054@flycatcher.gentoo.org> Date: Thu, 28 Apr 2011 06:27:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 96ac164ac78eaa485d27ab40b457bd73 phajdan.jr 11/04/28 06:27:12 Modified: ChangeLog chromium-9999-r1.ebuild Added: chromium-12.0.742.9-r1.ebuild Removed: chromium-12.0.742.9.ebuild Log: Use system libwebp. =20 (Portage version: 2.1.9.42/cvs/Linux i686) Revision Changes Path 1.345 www-client/chromium/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/ChangeLog?rev=3D1.345&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/ChangeLog?rev=3D1.345&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/ChangeLog?r1=3D1.344&r2=3D1.345 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- ChangeLog 27 Apr 2011 09:01:21 -0000 1.344 +++ ChangeLog 28 Apr 2011 06:27:12 -0000 1.345 @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.344= 2011/04/27 09:01:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.345= 2011/04/28 06:27:12 phajdan.jr Exp $ + +*chromium-12.0.742.9-r1 (28 Apr 2011) + + 28 Apr 2011; Pawel Hajdan jr + -chromium-12.0.742.9.ebuild, +chromium-12.0.742.9-r1.ebuild, + chromium-9999-r1.ebuild: + Use system libwebp. =20 *chromium-11.0.696.57 (27 Apr 2011) =20 1.22 www-client/chromium/chromium-9999-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/chromium-9999-r1.ebuild?rev=3D1.22&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/chromium-9999-r1.ebuild?rev=3D1.22&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/chromium-9999-r1.ebuild?r1=3D1.21&r2=3D1.22 Index: chromium-9999-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.eb= uild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- chromium-9999-r1.ebuild 23 Apr 2011 11:41:18 -0000 1.21 +++ chromium-9999-r1.ebuild 28 Apr 2011 06:27:12 -0000 1.22 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.= ebuild,v 1.21 2011/04/23 11:41:18 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.= ebuild,v 1.22 2011/04/28 06:27:12 phajdan.jr Exp $ =20 EAPI=3D"3" PYTHON_DEPEND=3D"2:2.6" @@ -33,6 +33,7 @@ virtual/jpeg media-libs/libpng >=3Dmedia-libs/libvpx-0.9.5 + >=3Dmedia-libs/libwebp-0.1.2 media-libs/speex cups? ( >=3Dnet-print/cups-1.3.11 ) sys-libs/pam @@ -176,7 +177,6 @@ \! -path 'third_party/libjingle/*' \ \! -path 'third_party/libsrtp/*' \ \! -path 'third_party/libvpx/libvpx.h' \ - \! -path 'third_party/libwebp/*' \ \! -path 'third_party/mesa/*' \ \! -path 'third_party/modp_b64/*' \ \! -path 'third_party/npapi/*' \ @@ -217,6 +217,7 @@ -Duse_system_libevent=3D1 -Duse_system_libjpeg=3D1 -Duse_system_libpng=3D1 + -Duse_system_libwebp=3D1 -Duse_system_libxml=3D1 -Duse_system_speex=3D1 -Duse_system_vpx=3D1 1.1 www-client/chromium/chromium-12.0.742.9-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/chromium-12.0.742.9-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromiu= m/chromium-12.0.742.9-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: chromium-12.0.742.9-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.= 9-r1.ebuild,v 1.1 2011/04/28 06:27:12 phajdan.jr Exp $ EAPI=3D"3" PYTHON_DEPEND=3D"2:2.6" inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \ pax-utils portability python toolchain-funcs versionator virtualx DESCRIPTION=3D"Open-source version of Google Chrome web browser" HOMEPAGE=3D"http://chromium.org/" SRC_URI=3D"http://build.chromium.org/official/${P}.tar.bz2" LICENSE=3D"BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~x86" IUSE=3D"cups gnome gnome-keyring kerberos xinerama" RDEPEND=3D"app-arch/bzip2 dev-libs/dbus-glib >=3Ddev-libs/icu-4.4.1 >=3Ddev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=3Ddev-libs/nss-3.12.3 gnome? ( >=3Dgnome-base/gconf-2.24.0 ) gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.28.2 ) >=3Dmedia-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=3Dmedia-libs/libvpx-0.9.5 >=3Dmedia-libs/libwebp-0.1.2 media-libs/speex cups? ( >=3Dnet-print/cups-1.3.11 ) sys-libs/pam sys-libs/zlib >=3Dvirtual/ffmpeg-0.6.90[threads] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst" DEPEND=3D"${RDEPEND} dev-lang/perl >=3Ddev-util/gperf-3.0.3 >=3Ddev-util/pkgconfig-0.23 sys-devel/flex >=3Dsys-devel/make-3.81-r2 x11-libs/libXinerama test? ( dev-python/simplejson virtual/krb5 )" RDEPEND+=3D" kerberos? ( virtual/krb5 ) xinerama? ( x11-libs/libXinerama ) x11-misc/xdg-utils virtual/ttf-fonts" gyp_use() { if [[ $# -lt 2 ]]; then echo "!!! usage: gyp_use " >&2 return 1 fi if use "$1"; then echo "-D$2=3D1"; else echo "-D$2=3D0"; fi } egyp() { set -- build/gyp_chromium --depth=3D. "${@}" echo "${@}" >&2 "${@}" } pkg_setup() { CHROMIUM_HOME=3D"/usr/$(get_libdir)/chromium-browser" # 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 # Prevent user problems like bug #299777. if ! grep -q /dev/shm <<< $(get_mounts); then ewarn "You don't have tmpfs mounted at /dev/shm." ewarn "${PN} may fail to start in that configuration." ewarn "Please uncomment the /dev/shm entry in /etc/fstab," ewarn "and run 'mount /dev/shm'." fi if [ `stat -c %a /dev/shm` -ne 1777 ]; then ewarn "/dev/shm does not have correct permissions." ewarn "${PN} may fail to start in that configuration." ewarn "Please run 'chmod 1777 /dev/shm'." fi # Prevent user problems like bug #348235. eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then ewarn "You have enabled debug info (probably have -g or -ggdb in your \= $C{,XX}FLAGS)." ewarn "You may experience really long compilation times and/or increase= d memory usage." ewarn "If compilation fails, please try removing -g{,gdb} before report= ing a bug." fi eshopts_pop # Warn if the kernel doesn't support features useful for sandboxing, # bug #363907. CONFIG_CHECK=3D"~PID_NS ~NET_NS" PID_NS_WARNING=3D"PID (process id) namespaces are needed for sandboxing.= " NET_NS_WARNING=3D"Network namespaces are needed for sandboxing." check_extra_config } src_prepare() { # Make sure we don't use bundled libvpx headers. epatch "${FILESDIR}/${PN}-system-vpx-r4.patch" # Fix compilation with system zlib, bug #364205. To be upstreamed. epatch "${FILESDIR}/${PN}-system-zlib-r0.patch" # Fix compilation without CUPS, bug #364525. To be upstreamed. epatch "${FILESDIR}/${PN}-cups-r0.patch" # 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/expat/*' \ \! -path 'third_party/ffmpeg/*' \ \! -path 'third_party/flac/flac.h' \ \! -path 'third_party/gpsd/*' \ \! -path 'third_party/harfbuzz/*' \ \! -path 'third_party/hunspell/*' \ \! -path 'third_party/iccjpeg/*' \ \! -path 'third_party/launchpad_translations/*' \ \! -path 'third_party/leveldb/*' \ \! -path 'third_party/libjingle/*' \ \! -path 'third_party/libsrtp/*' \ \! -path 'third_party/libvpx/libvpx.h' \ \! -path 'third_party/mesa/*' \ \! -path 'third_party/modp_b64/*' \ \! -path 'third_party/npapi/*' \ \! -path 'third_party/openmax/*' \ \! -path 'third_party/ots/*' \ \! -path 'third_party/protobuf/*' \ \! -path 'third_party/pyftpdlib/*' \ \! -path 'third_party/skia/*' \ \! -path 'third_party/speex/speex.h' \ \! -path 'third_party/sqlite/*' \ \! -path 'third_party/tcmalloc/*' \ \! -path 'third_party/tlslite/*' \ \! -path 'third_party/undoview/*' \ \! -path 'third_party/zlib/contrib/minizip/*' \ -delete || die # Make sure the build system will use the right python, bug #344367. # Only convert directories that need it, to save time. python_convert_shebangs -q -r 2 build tools } src_configure() { local myconf=3D"" # Never tell the build system to "enable" SSE2, it has a few unexpected # additions, bug #336871. myconf+=3D" -Ddisable_sse2=3D1" # Use system-provided libraries. # TODO: use_system_hunspell (upstream changes needed). # TODO: use_system_ssl (http://crbug.com/58087). # TODO: use_system_sqlite (http://crbug.com/22208). myconf+=3D" -Duse_system_bzip2=3D1 -Duse_system_flac=3D1 -Duse_system_ffmpeg=3D1 -Duse_system_icu=3D1 -Duse_system_libevent=3D1 -Duse_system_libjpeg=3D1 -Duse_system_libpng=3D1 -Duse_system_libwebp=3D1 -Duse_system_libxml=3D1 -Duse_system_speex=3D1 -Duse_system_vpx=3D1 -Duse_system_xdg_utils=3D1 -Duse_system_zlib=3D1" # Optional dependencies. myconf+=3D" $(gyp_use cups use_cups) $(gyp_use gnome use_gconf) $(gyp_use gnome-keyring use_gnome_keyring) $(gyp_use gnome-keyring linux_link_gnome_keyring)" # Enable sandbox. myconf+=3D" -Dlinux_sandbox_path=3D${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=3D${CHROMIUM_HOME}/chrome" if host-is-pax; then # Prevent the build from failing (bug #301880). The performance # difference is very small. myconf+=3D" -Dv8_use_snapshot=3D0" fi # Our system ffmpeg should support more codecs than the bundled one # for Chromium. myconf+=3D" -Dproprietary_codecs=3D1" # Use target arch detection logic from bug #354601. case ${CHOST} in i?86-*) myarch=3Dx86 ;; x86_64-*) if [[ $ABI =3D "" ]] ; then myarch=3Damd64 else myarch=3D"$ABI" fi ;; arm*-*) myarch=3Darm ;; *) die "Unrecognized CHOST: ${CHOST}" esac if [[ $myarch =3D amd64 ]] ; then myconf+=3D" -Dtarget_arch=3Dx64" elif [[ $myarch =3D x86 ]] ; then myconf+=3D" -Dtarget_arch=3Dia32" elif [[ $myarch =3D arm ]] ; then # TODO: check this again after # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D39509 is fixed. append-flags -fno-tree-sink myconf+=3D" -Dtarget_arch=3Darm -Ddisable_nacl=3D1 -Dlinux_use_tcmalloc= =3D0" 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+=3D" -Dwerror=3D" # Avoid a build error with -Os, bug #352457. replace-flags "-Os" "-O2" egyp ${myconf} || die } src_compile() { emake chrome chrome_sandbox BUILDTYPE=3DRelease V=3D1 || die pax-mark m out/Release/chrome if use test; then emake {base,crypto,googleurl,net}_unittests BUILDTYPE=3DRelease V=3D1 |= | die pax-mark m out/Release/{base,crypto,googleurl,net}_unittests fi } src_test() { # For more info see bug #350349. local mylocale=3D'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 #350347. LC_ALL=3D"${mylocale}" VIRTUALX_COMMAND=3Dout/Release/base_unittests vir= tualmake \ '--gtest_filter=3D-ICUStringConversionsTest.*' LC_ALL=3D"${mylocale}" VIRTUALX_COMMAND=3Dout/Release/crypto_unittests v= irtualmake LC_ALL=3D"${mylocale}" VIRTUALX_COMMAND=3Dout/Release/googleurl_unittest= s virtualmake # NetUtilTest: bug #361885. # UDP: unstable, active development. We should revisit this later. LC_ALL=3D"${mylocale}" VIRTUALX_COMMAND=3Dout/Release/net_unittests virt= ualmake \ '--gtest_filter=3D-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UD= P*' } src_install() { exeinto "${CHROMIUM_HOME}" doexe out/Release/chrome doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die # 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 = || die # keep the old symlink around for consistency dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die insinto "${CHROMIUM_HOME}" doins out/Release/chrome.pak || die doins out/Release/resources.pak || die doins -r out/Release/locales || die doins -r out/Release/resources || die newman out/Release/chrome.1 chromium.1 || die newman out/Release/chrome.1 chromium-browser.1 || die # Chromium looks for these in its folder # See media_posix.cc and base_paths_linux.cc dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die # Install icons and desktop entry. for SIZE in 16 22 24 32 48 64 128 256 ; do insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ chromium-browser.png || die done local mime_types=3D"text/html;text/xml;application/xhtml+xml;" mime_types+=3D"x-scheme-handler/http;x-scheme-handler/https;" # bug #360= 797 make_desktop_entry chromium-browser "Chromium" chromium-browser \ "Network;WebBrowser" "MimeType=3D${mime_types}" sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || d= ie # 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 doins "${FILESDIR}"/chromium-browser.xml || die fi } pkg_preinst() { gnome2_icon_savelist } pkg_postinst() { fdo-mime_desktop_database_update gnome2_icon_cache_update # For more info see bug #292201, bug #352263, bug #361859. elog elog "Depending on your desktop environment, you may need" elog "to install additional packages to get icons on the Downloads page.= " elog elog "For KDE, the required package is kde-base/oxygen-icons." elog elog "For other desktop environments, try one of the following:" elog " - x11-themes/gnome-icon-theme" elog " - x11-themes/tango-icon-theme" # For more info see bug #359153. elog elog "Some web pages may require additional fonts to display properly." elog "Try installing some of the following packages if some characters" elog "are not displayed properly:" elog " - media-fonts/arphicfonts" elog " - media-fonts/bitstream-cyberbit" elog " - media-fonts/droid" elog " - media-fonts/ipamonafont" elog " - media-fonts/ja-ipafonts" elog " - media-fonts/takao-fonts" elog " - media-fonts/wqy-microhei" elog " - media-fonts/wqy-zenhei" } pkg_postrm() { gnome2_icon_cache_update }