From: Paweł Hajdan Date: Thu, 8 Apr 2010 05:43:41 +0000 (+0000) Subject: Version bump for beta channel release. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38b64548b13dafb080f29a9017858ad1cd7ce712;p=gentoo.git Version bump for beta channel release. Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 69040bd2c0f6..86ef44c5f33c 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.77 2010/04/05 15:23:11 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.78 2010/04/08 05:43:41 phajdan.jr Exp $ + +*chromium-5.0.342.9 (08 Apr 2010) + + 08 Apr 2010; Pawel Hajdan jr + +chromium-5.0.342.9.ebuild: + Version bump for beta channel release. 05 Apr 2010; Pawel Hajdan jr chromium-5.0.342.7.ebuild, chromium-5.0.360.5.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 1d69b38462a1..9d89fd42533b 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -6,11 +6,13 @@ AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a DIST chromium-5.0.342.7.tar.bz2 155598620 RMD160 4afac79db21172596037c7aa03e797e722b1aaf4 SHA1 09fad49eb63863dcac515fc1c82aa51c8e2d7ebb SHA256 d3a2ad54b925da27dea290f421494b47a046123cb0659214f99502a0a86a4b3d +DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903 DIST chromium-5.0.360.5.tar.bz2 160968726 RMD160 7d53b3ccf59b6759704607c349322cefffb1d68e SHA1 f38e6a5234f5b39ea9e2262f933057ae9e7e8c5e SHA256 44da030ce701510f0949e9483dfd9480089f8054d89373a538d05ab0f3dcc108 DIST chromium-5.0.366.2.tar.bz2 162986774 RMD160 d18fc87d571d7c76bf59128438b52ce1122153a5 SHA1 cbf22badb06797972d94d3e4ca07fd4ac77de883 SHA256 11df6280383040bfb797ef0e64f6ca63281dfa18dcbb5612f71c3bd842555d0f EBUILD chromium-5.0.342.7.ebuild 6565 RMD160 c36ab88fb6211e01358dbda562d54350be8d7e6b SHA1 be75a09d91e70ed7145affeada9e522ddc0356eb SHA256 97854c502c538ff1c8c1658ca5104c3a475ca749b250868b0f5dc7da29e23236 +EBUILD chromium-5.0.342.9.ebuild 6565 RMD160 7e4d556a9820abcdd46e0240d9116836b321bdcb SHA1 5e56e82d276b58298e76e015974aa2f888698c52 SHA256 7faab279b35573483cafc4ada425535f3f1552f53d3db20f306b9179e2a02b2e EBUILD chromium-5.0.360.5.ebuild 6565 RMD160 8bf565d0bacae19cd0e6ea407c81a888bc6f9aa5 SHA1 44484d9d2aba8f51a63a2f824b79fb2b9b83047f SHA256 646737d054efb4bf8793341c562afbf2181fc9a03d4d8ce34b2a3f65ddbb9e77 EBUILD chromium-5.0.366.2.ebuild 6534 RMD160 8bc649c153aeed1df97e6a814e336e97654d837f SHA1 11b9f35fc7f7dedbbb9673ed9717d1954dcb6397 SHA256 ecabef1f0c9c8cad45349caa9734b7b0fa96285c177c3f19772a63be9ddbebaf EBUILD chromium-9999.ebuild 8287 RMD160 d1d186c7a1207a35665ffc6317e0990c75b75831 SHA1 cd8097e1c9a6b8f9b7928149a9c2b26b98187cb7 SHA256 8a70d5ebe1d3dd864ad7963e5c27f1a8242e3231a11887e99ee3e02d69837596 -MISC ChangeLog 17768 RMD160 dd4661dbe7ef9bd6656a212c85451799914215e8 SHA1 d3d3ccf8ac13f19a3b07a34f47db0d734bb5622f SHA256 7b2cbcc68ba2a025fa12b23fbe6152ada34de9aeca0940788825ad1c73c24cdc +MISC ChangeLog 17930 RMD160 b78319bb981ac87dff1fce8174a46fae2d77fde6 SHA1 ecf14ad17265a84313dd05d7493a833924a3799c SHA256 07d7b67f8ba4ca2fa3e67f06ddef58dbebd732e4ec7ef7acdefa0b5315eb1afd MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c diff --git a/www-client/chromium/chromium-5.0.342.9.ebuild b/www-client/chromium/chromium-5.0.342.9.ebuild new file mode 100644 index 000000000000..be510eea1eff --- /dev/null +++ b/www-client/chromium/chromium-5.0.342.9.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.9.ebuild,v 1.1 2010/04/08 05:43:41 phajdan.jr Exp $ + +EAPI="2" +inherit eutils flag-o-matic multilib portability toolchain-funcs + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="bindist +ffmpeg +plugins-symlink" + +RDEPEND="app-arch/bzip2 + >=dev-libs/libevent-1.4.13 + dev-libs/libxml2 + dev-libs/libxslt + >=dev-libs/nss-3.12.3 + >=gnome-base/gconf-2.24.0 + >=media-libs/alsa-lib-1.0.19 + media-libs/jpeg:0 + media-libs/libpng + ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 ) + sys-libs/zlib + >=x11-libs/gtk+-2.14.7 + x11-libs/libXScrnSaver" +# dev-db/sqlite:3 +DEPEND="${RDEPEND} + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + sys-devel/flex" +RDEPEND+=" + || ( + x11-themes/gnome-icon-theme + x11-themes/tango-icon-theme + x11-themes/xfce4-icon-theme + ) + x11-misc/xdg-utils + virtual/ttf-fonts" + +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer[gnome] + )" + +pkg_setup() { + if [[ "${ROOT}" == "/" ]]; then + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi + fi + + elog "${PN} might crash occasionally. To get more useful backtraces" + elog "and submit better bug reports, please read" + elog "http://www.gentoo.org/proj/en/qa/backtraces.xml" + + if ! use bindist; then + einfo + elog "You may not redistribute this build to any users on your network" + elog "or the internet." + elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" + fi +} + +src_prepare() { + # Gentoo uses .kde4, not .kde + # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927 + # would be better + sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \ + || die "kde proxy sed failed" + # Changing this in ~/include.gypi does not work + sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed" + # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 + epatch "${FILESDIR}"/${PN}-drop_sse2.patch + if ! use bindist; then + # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg + epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch + fi + # Fix build failure with libpng-1.4, bug 310959. + epatch "${FILESDIR}"/${PN}-libpng-1.4.patch + # Prevent the make build from filling entire disk space on some systems, + # bug 297273. + epatch "${FILESDIR}"/${PN}-fix-make-build.patch + + # Disable prefixing to allow linking against system zlib + sed -e '/^#include "mozzconf.h"$/d' \ + -i third_party/zlib/zconf.h \ + || die "zlib sed failed" +} + +src_configure() { + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + + # Fails to build on arm if we don't do this + use arm && append-flags -fno-tree-sink + + # CFLAGS/LDFLAGS + mkdir -p "${S}"/.gyp + cat << EOF > "${S}"/.gyp/include.gypi +{ + 'target_defaults': { + 'cflags': [ '${CFLAGS// /','}' ], + 'ldflags': [ '${LDFLAGS// /','}' ], + }, +} +EOF + export HOME="${S}" + + # Configuration options (system libraries) + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" + # -Duse_system_sqlite=1 : http://crbug.com/22208 + # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) + + # Sandbox paths + myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" + + if use amd64 ; then + myconf="${myconf} -Dtarget_arch=x64" + fi + + if use x86 ; then + myconf="${myconf} -Dtarget_arch=ia32" + fi + + if use arm; then + myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + fi + + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then + myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" + fi + + if use ffmpeg; then + myconf="${myconf} -Duse_system_ffmpeg=1" + fi + + build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" +} + +src_compile() { + emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ + rootdir="${S}" \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + || die "compilation failed" +} + +src_install() { + # Chromium does not have "install" target in the build system. + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + + dodir ${CHROMIUM_HOME} + + exeinto ${CHROMIUM_HOME} + doexe out/Release/chrome + doexe out/Release/chrome_sandbox + fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox + doexe out/Release/xdg-settings + doexe "${FILESDIR}"/chromium-launcher.sh + + insinto ${CHROMIUM_HOME} + doins out/Release/chrome.pak + + doins -r out/Release/locales + doins -r out/Release/resources + + # chrome.1 is for chromium --help + newman out/Release/chrome.1 chrome.1 + newman out/Release/chrome.1 chromium.1 + + if use ffmpeg; then + # 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} + dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} + fi + + # Plugins symlink, optional wrt bug #301911 + if use plugins-symlink; then + dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins + fi + + # Icon and desktop entry + newicon out/Release/product_logo_48.png ${PN}-browser.png + dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium + make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" + sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ + || die "desktop file sed failed" + # Gnome default application entry + dodir /usr/share/gnome-control-center/default-apps + insinto /usr/share/gnome-control-center/default-apps + doins "${FILESDIR}"/chromium.xml +}