From 2f82c9286f3d11d8c061b77fa77f81d0830ba504 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Mon, 29 Mar 2010 16:14:16 +0000 Subject: [PATCH] Version bump for dev channel release. Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- www-client/chromium/ChangeLog | 8 +- www-client/chromium/Manifest | 4 +- www-client/chromium/chromium-5.0.360.0.ebuild | 209 ++++++++++++++++++ 3 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 www-client/chromium/chromium-5.0.360.0.ebuild diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 751072f792ea..7da4434ad7d5 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.70 2010/03/25 11:52:12 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.71 2010/03/29 16:14:16 phajdan.jr Exp $ + +*chromium-5.0.360.0 (29 Mar 2010) + + 29 Mar 2010; Pawel Hajdan jr + +chromium-5.0.360.0.ebuild: + Version bump for dev channel release. *chromium-5.0.342.7 (25 Mar 2010) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 77fecdc8b6fa..e8c2154160fd 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -7,10 +7,12 @@ DIST chromium-5.0.307.11.tar.bz2 153145874 RMD160 2e8820fae4bd2ca0b6e7c4c3f0d10e DIST chromium-5.0.342.5.tar.bz2 155676151 RMD160 89901dbccd82bb6367f1c8f37007f0be0505edbf SHA1 9a19e44830db7c3be33737ba10e7a9288c1376b1 SHA256 27e0f225aff3f4b20ae8ee95dc47abcaaee2b725e6565f5209fbbf305718b3ab DIST chromium-5.0.342.7.tar.bz2 155598620 RMD160 4afac79db21172596037c7aa03e797e722b1aaf4 SHA1 09fad49eb63863dcac515fc1c82aa51c8e2d7ebb SHA256 d3a2ad54b925da27dea290f421494b47a046123cb0659214f99502a0a86a4b3d DIST chromium-5.0.356.0.tar.bz2 157739333 RMD160 352b5e2626f8d157b87b9575b254302dced41d69 SHA1 01946018c68b7c4556155b4ab74119bfa75617b0 SHA256 2cae996c29e4f865a38e751480bef1327a5121ff8b4019274d44d912fe9c7841 +DIST chromium-5.0.360.0.tar.bz2 160952531 RMD160 3d3b978ad50c66148f18aa4ca6f20b998929f012 SHA1 54547459f38efca654715d725a4f2abea13e2ceb SHA256 161f5fb5f51962a90dc46df4154c48c0123c02cb320f97a0c42fcbc4b96f7a67 EBUILD chromium-5.0.307.11.ebuild 6141 RMD160 f457412c120d1d52c735a6a163d507ae052a330a SHA1 5f9ab48763b1657ff22f0f70869f5b50bcd68d68 SHA256 83809a7f2fd406a76e0de98f88b9ca91ebaf1d38ea192ca98bf5c5a35451343a EBUILD chromium-5.0.342.5.ebuild 6451 RMD160 f7010ac7226bb38d61f15fa747731f28f7f121fd SHA1 d826f60375c8ca3a22273da344bed6d82511f088 SHA256 a88ec5bd0ae8a26bd6fe6a464a189296274fb2c7d0e44ac8f56f8f00ac7696b6 EBUILD chromium-5.0.342.7.ebuild 6449 RMD160 aa8a24a34332a43d1cb0284a9c9ee3a4209fda16 SHA1 d2e67b8bbe037d0105eedbe4f2cdb5ff118dec95 SHA256 2946eda059d79673013b7c235cf9d2a11baa56fd87ae049d630af79974fbe3f1 EBUILD chromium-5.0.356.0.ebuild 6451 RMD160 f96a988c18372c3641eab09219032554877026ef SHA1 a6c6b27ed95a3d1d8bfeeb6cd852e309c05acddf SHA256 2d452786cfc97f0eeb697e7f8c5626e89215e67fbeeec00a30fb27d7eaa66738 +EBUILD chromium-5.0.360.0.ebuild 6451 RMD160 86b1deeb8084b0c5eb388bca47bbe06ead1fc56d SHA1 b309bc663c4b6ef7c9e8076ba5e111e72503f82d SHA256 9ad943b3a68ef75841b0ee4242569452cb8c0d4f2e0da4fdb57ebff44d462e87 EBUILD chromium-9999.ebuild 8204 RMD160 31a1cf8fbd7baebb3222a56fa7986b33a84df12c SHA1 883726c9cdfb79f633b9ba1aef62d9b6309a4d7d SHA256 6d77dd6ba8a64afce4e68bb4661b8aa11514d77d68515c984a499e704cb4e80c -MISC ChangeLog 16198 RMD160 801d7445ecb18556f99f001436cff7589bc1e36a SHA1 f90647634210a8612182333b934738077869ade9 SHA256 e51d8374df8ea1a90753ef2416918b4ffd7073b853adb5c9bd8c1e91a874ef59 +MISC ChangeLog 16361 RMD160 3c0d87e7f4bb59c4dd00078b9e1f93ff569c9573 SHA1 f6bdc4855913b4dbe821dce75e04b41ea5c25508 SHA256 18d11a7a90e33d6b550a18c0d9a934f9b382766177eb2b2204964e00332b4ce3 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c diff --git a/www-client/chromium/chromium-5.0.360.0.ebuild b/www-client/chromium/chromium-5.0.360.0.ebuild new file mode 100644 index 000000000000..f91ddf5d30c0 --- /dev/null +++ b/www-client/chromium/chromium-5.0.360.0.ebuild @@ -0,0 +1,209 @@ +# 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.360.0.ebuild,v 1.1 2010/03/29 16:14:16 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" + +# 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 + # 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 +} -- 2.26.2