Bump to fix bug #293539 (crash at startup for stable amd64)

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

3 files changed, 139 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7770551b2e4a..e31144a91527 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.22 2009/11/15 23:26:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.23 2009/11/18 22:18:41 voyageur Exp $
+
+*chromium-4.0.251.0 (18 Nov 2009)
+
+  18 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.251.0.ebuild:
+  Bump to fix bug #293539 (crash at startup for stable amd64)
 
 *chromium-4.0.248.0 (15 Nov 2009)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9ccbba4cdbaa..1342a7f3036f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,8 +3,10 @@ AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA
 AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb
 DIST chromium-4.0.240.0.tar.bz2 136243212 RMD160 23df5533fe91f96235154e9853f5f5a7d6c4b61c SHA1 69c161cc7dcbd11eb5cc465a17e626748943a2ea SHA256 d8c63916fd0dade512443c395e8b6e1da3f6c61932eaca45e83b3e5be835d800
 DIST chromium-4.0.248.0.tar.bz2 136592064 RMD160 fbd155a01b296103144385ed156ff5b18c5d6e4d SHA1 a3916994e2ab8098124994d10dc01c9b063fa70d SHA256 635d762c63f56f79ab13c2279606ec7a7e8ae6b25e766c94351b0b93589c1565
+DIST chromium-4.0.251.0.tar.bz2 133265804 RMD160 250d12cab201f53ff87b89c2e4b5a031d34951e8 SHA1 1e8d0e3c4defa13922f898f9612804dd347114f5 SHA256 db6a1a4d1547467bf95f49d175de0644f9917067b2be1e52931d692eba7d994e
 EBUILD chromium-4.0.240.0.ebuild 4179 RMD160 6b4980a31e3423e02b7b993dab265d04bfd7e53e SHA1 7502cdd2b104fbc26f69156d45fbf57b43e45158 SHA256 29213344f3e7f389934888b17fbafa6156b8e3bfa2c0b559bed1fc28386b54dd
 EBUILD chromium-4.0.248.0.ebuild 4179 RMD160 72a02b1782b2c4f13088cbf52816ac46c0141975 SHA1 fc5bfdaf9179ac15089811e115c77896ce628995 SHA256 4782bb1aa863c87fdd1d19d698d8ce4564bba4fcf71cb5f18a0bdc1e9659090a
+EBUILD chromium-4.0.251.0.ebuild 3997 RMD160 f27196de6d8dd75445885ca8b9ceaa37e8abfd22 SHA1 1dc567a163295e59eaa8cf0797683d0d19880d86 SHA256 086a0882a7c740b0dd5ae6a7af4e2fcbe0ad32c95834a894fe0e34d135f4c1bb
 EBUILD chromium-9999.ebuild 5536 RMD160 1fe65a05f4b4daaed801764d12a21536f3fd5b05 SHA1 827a1522d229ab17b250e4e417013988299d33bb SHA256 828e8b223926e3f1d7ced62556b085bb86587450bb68496a474bb442d9bf889c
-MISC ChangeLog 5208 RMD160 b2a27390b01d3ff9251be095a9777e66e9a4a6e1 SHA1 a6837f4f92f5150efa59c16cfc6b7d17b5327fec SHA256 a280e10278595d524f4d7d3cdd18ba73e8316ae24b9ac733c0cef8ff05b8f9ef
+MISC ChangeLog 5391 RMD160 3155dcd5f580d2abf1eb5dd8fd33b117f47f030e SHA1 086d82b1973ecd802f56b73ab6290fafc7e51666 SHA256 ff3504e6ed771dc3df41ddb2a36825021a8934954ae100f82ace526cd400077f
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium/chromium-4.0.251.0.ebuild b/www-client/chromium/chromium-4.0.251.0.ebuild
new file mode 100644
index 000000000000..ff415b096ac6
--- /dev/null
+++ b/www-client/chromium/chromium-4.0.251.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.251.0.ebuild,v 1.1 2009/11/18 22:18:41 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.2
+	>=gnome-base/gconf-2.24.0
+	media-fonts/corefonts
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-video/ffmpeg-0.5_p19787
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-themes/gnome-icon-theme"
+#	>=dev-libs/libevent-1.4.13
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23"
+
+export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+src_prepare() {
+	# 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
+	# Add configuration flag to use system libevent
+	epatch "${FILESDIR}"/${PN}-use_system_libevent.patch
+
+	# Disable prefixing to allow linking against system zlib
+	sed -e '/^#include "mozzconf.h"$/d' \
+		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
+		|| die "zlib sed failed"
+}
+
+src_configure() {
+	# 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_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
+	# -Duse_system_libevent=1: http://crbug.com/22140
+	# -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 [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	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.
+
+	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
+
+	newman out/Release/chromium-browser.1 chrome.1
+
+	# 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}
+
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+
+	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"
+}