From: Paweł Hajdan Date: Fri, 14 May 2010 19:39:43 +0000 (+0000) Subject: Version bump for dev channel release. Fixes bug #318969 by Petr Gregor X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb06d6cfc027c7bb1fdf79395f712682734957d7;p=gentoo.git Version bump for dev channel release. Fixes bug #318969 by Petr Gregor . Fixes bug #319431 by Auke Booij . Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index d1951224d2d8..1ebcf43a21b7 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # 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.98 2010/05/11 12:17:26 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.99 2010/05/14 19:39:43 phajdan.jr Exp $ + +*chromium-6.0.401.1 (14 May 2010) + + 14 May 2010; Pawel Hajdan jr + +chromium-6.0.401.1.ebuild, chromium-9999.ebuild: + Version bump for dev channel release. Fixes bug #318969 by Petr Gregor + . Fixes bug #319431 by Auke Booij . *chromium-5.0.375.38 (11 May 2010) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 118ea7b3f1a2..1dec36e58c2c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6 @@ -11,16 +8,11 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b DIST chromium-5.0.375.38.tar.bz2 163360507 RMD160 fcb75ca4aa61e81378c45005601bd292a6ae19c8 SHA1 557df642958846a25e92fe00e1fe46e7d78adc05 SHA256 26912fdf57e32b2d859af45631a6797bb83af42d62b4cc94c3625382712d8ac2 DIST chromium-5.0.396.0.tar.bz2 168297098 RMD160 b941e1e94483ae35f61d71e6a15f50ac96a57002 SHA1 ec53faddff39b09dfc9609c7b61042cc91a5f405 SHA256 08b89b9ead59114b2c53a462e42032da53f9e2e024ae77318fbdfb1f7415fcff +DIST chromium-6.0.401.1.tar.bz2 170937577 RMD160 7d4218faf521e0c7d08719f8e9d8685939cc94ea SHA1 ceeb841185872adc0b62cbac9e8e595e7ebf634a SHA256 44cdf122a4b4d9a09e771cdcb74cc3d54dd1f6cf5773d5988e0653eb8fc404db EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e EBUILD chromium-5.0.375.38.ebuild 5440 RMD160 f51212584075bf894458925729b9beaced45a941 SHA1 4ef358d10c68640cc13f52368cccc27f29f02659 SHA256 fa002da09aa98a98c6c27e7e1ba02d82fabe44fb7f0c811a35c6376224b7dd45 EBUILD chromium-5.0.396.0.ebuild 5253 RMD160 a77c0ec95c5987fc48624a588eb4af956a52a126 SHA1 14576bcb0c9818777691dcfad63336ba6e280805 SHA256 b1613e582d974bb5ced25681e395d9da4e55787340a096618f337213d8345c96 -EBUILD chromium-9999.ebuild 7006 RMD160 8daf2b57042d039463fc8192bc4aa12fa9a81a4f SHA1 30453619741233cf1503892279c95de69f6eeafa SHA256 ee2fb89ab346e638851100bff6f3bd8494672db751cac1fd47ba36e29c47cfbf -MISC ChangeLog 22597 RMD160 f67d27146698bef1fd20a056fc0165e579a57a4e SHA1 b0e53b92d1c046debab07dfa0b7fa23182c2b223 SHA256 322f33a7d264ccf4771653a02a69d736dcf23c3c5fb38b63166aafcd5f27ac7f +EBUILD chromium-6.0.401.1.ebuild 5276 RMD160 f49259b1cdf9821a4933a44dded75410e5422a05 SHA1 8870657017ae63d11e8c8d0610d9ce847182486c SHA256 6eafbfe4babbf3600a4d7d0cad069789e9bc4688228d76e9649013f6f9453729 +EBUILD chromium-9999.ebuild 7029 RMD160 4201b67deec2ae2c8d7da33910e9c0d931942263 SHA1 17d093724f616ee32621c18bce80ac24a3dea48c SHA256 a559d8b3bb52e9f2f4fe513e370f5e7c700f5533e11b9587e5fafca53b8ed16c +MISC ChangeLog 22893 RMD160 4a447c802c9d5cea7cc9859afc2cae9f2e4b5877 SHA1 9b20591baa0c55b83dcfdabe57f2af3701915a9c SHA256 5a54affd9a2c6a82443471874b46f5525241eca29d77d87ddb51e429cc458e9b MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkvpStwACgkQV3J2n04Eauw7dgCfba89RJFIrv1vCFPwxSC+KgRl -KqYAn00vhozWYU9d+T0M2TPxmcvtB02q -=jGa0 ------END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-6.0.401.1.ebuild b/www-client/chromium/chromium-6.0.401.1.ebuild new file mode 100644 index 000000000000..c0f7d0f05100 --- /dev/null +++ b/www-client/chromium/chromium-6.0.401.1.ebuild @@ -0,0 +1,170 @@ +# 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-6.0.401.1.ebuild,v 1.1 2010/05/14 19:39:43 phajdan.jr Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib pax-utils 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="+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 + >=media-video/ffmpeg-0.5_p21602[threads] + sys-libs/zlib + >=x11-libs/gtk+-2.14.7 + x11-libs/libXScrnSaver" +# dev-db/sqlite:3 +DEPEND="${RDEPEND} + dev-lang/perl + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + sys-devel/flex" +RDEPEND+=" + || ( + x11-themes/gnome-icon-theme + x11-themes/oxygen-molecule + x11-themes/tango-icon-theme + x11-themes/xfce4-icon-theme + ) + x11-apps/xmessage + x11-misc/xdg-utils + virtual/ttf-fonts" + +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer[gnome] + )" + +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 + + # Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is + # fixed. + append-cflags -D__STDC_CONSTANT_MACROS + + # CFLAGS/LDFLAGS + mkdir -p "${S}"/.gyp || die "cflags mkdir failed" + cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed" +{ + 'target_defaults': { + 'cflags': [ '${CFLAGS// /','}' ], + 'ldflags': [ '${LDFLAGS// /','}' ], + }, +} +EOF + export HOME="${S}" + + # Configuration options (system libraries and disable forced SSE2) + local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=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" + + # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), + # and the performance gain isn't worth it. + myconf="${myconf} -Dv8_use_snapshot=0" + + # Use target arch detection logic from bug #296917. + local myarch="$ABI" + [[ $myarch = "" ]] && myarch="$ARCH" + + if [[ $myarch = amd64 ]] ; then + myconf="${myconf} -Dtarget_arch=x64" + elif [[ $myarch = x86 ]] ; then + myconf="${myconf} -Dtarget_arch=ia32" + elif [[ $myarch = arm ]] ; then + myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + else + die "Failed to determine target arch, got '$myarch'." + fi + + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then + myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" + 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="${myconf} -Dwerror=" + + 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} + pax-mark m out/Release/chrome + 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 + + # 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, 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 +} diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index afd570238988..1995acf82277 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.50 2010/05/11 11:23:48 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.51 2010/05/14 19:39:43 phajdan.jr Exp $ EAPI="2" @@ -97,16 +97,15 @@ src_unpack() { elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH}_p${CREV} " } -src_prepare() { - # Allow supporting more media types. - epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch -} - 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 + # Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is + # fixed. + append-cflags -D__STDC_CONSTANT_MACROS + # CFLAGS/LDFLAGS mkdir -p "${S}"/.gyp || die "cflags mkdir failed" cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed" @@ -120,7 +119,7 @@ EOF export HOME="${S}" # Configuration options (system libraries and disable forced SSE2) - local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" + local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=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)