From: Paweł Hajdan Date: Fri, 7 May 2010 08:37:53 +0000 (+0000) Subject: Version bump for dev channel release. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=acfb4dff93d08b70a2824603c398f002d5eda49c;p=gentoo.git Version bump for dev channel release. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 87fc9c085213..e8960a184a83 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.95 2010/05/05 12:33:26 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.96 2010/05/07 08:37:53 phajdan.jr Exp $ + +*chromium-5.0.396.0 (07 May 2010) + + 07 May 2010; Pawel Hajdan jr + +chromium-5.0.396.0.ebuild: + Version bump for dev channel release. 05 May 2010; Bernard Cafarelli -files/chromium-drop_sse2-r1.patch, chromium-9999.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 1f31d7bfdc85..b87c6ad17c97 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -10,9 +10,11 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903 DIST chromium-5.0.375.23.tar.bz2 161814334 RMD160 139573ba251c4e1a99b0649091b0d52b9553322e SHA1 78bdf22b065bc7da56534f1f0d5d1356694fb260 SHA256 145341c01f81bd64f6ff3e9f762c1aff46206f714d81b3fab7ef8bd178e00140 DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b +DIST chromium-5.0.396.0.tar.bz2 168297098 RMD160 b941e1e94483ae35f61d71e6a15f50ac96a57002 SHA1 ec53faddff39b09dfc9609c7b61042cc91a5f405 SHA256 08b89b9ead59114b2c53a462e42032da53f9e2e024ae77318fbdfb1f7415fcff EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29 EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721 EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e +EBUILD chromium-5.0.396.0.ebuild 6249 RMD160 f33e6fb2928e93eceeaa33a37e126937c1cf61fc SHA1 f08e46bdf95f23205993c365f94d66517ebdb323 SHA256 1ab516c2333b9b7be05621910c4f78b06b46976c31ae4746d9b338226f714e34 EBUILD chromium-9999.ebuild 8000 RMD160 2dd685a3b089b0aa070db70a7cd27d50778b8375 SHA1 1e150dbc1c1961c12473f73201f956fcfc235571 SHA256 597d44c1dff5153a6c3c04f19d4a22f6d02a1465c5238214f413418e4415d877 -MISC ChangeLog 21723 RMD160 4caf4ef8a1227cb582e02114f41416af20974d02 SHA1 1f39a9fbc1539ccf7a1c9287e5d239ff70ca50da SHA256 4e786bc19d9241eae4c194fe7ac6abe461ddf048dbf2ef2327327b34f5c2b0b8 +MISC ChangeLog 21886 RMD160 a3aed19cea2d5ea506715fb9fc369e846a7cd4b9 SHA1 75e91f2c7615f09d83ad7e36dca41779cba9dd56 SHA256 31756cc1e7d42fda4a73b55b8a972fa45c9fca1f2e00b6df5423d4bb1e177bf6 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 diff --git a/www-client/chromium/chromium-5.0.396.0.ebuild b/www-client/chromium/chromium-5.0.396.0.ebuild new file mode 100644 index 000000000000..94eb15b5ba7c --- /dev/null +++ b/www-client/chromium/chromium-5.0.396.0.ebuild @@ -0,0 +1,199 @@ +# 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.396.0.ebuild,v 1.1 2010/05/07 08:37:53 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="mp3 +plugins-symlink x264" + +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[mp3=,threads,x264=] + 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-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" +} + +src_prepare() { + # Allow supporting more media types provided system ffmpeg supports them. + epatch "${FILESDIR}"/${PN}-supported-media-mime-types.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 + + if use mp3 ; then + append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED + fi + + if use x264 ; then + append-cflags -DGENTOO_CHROMIUM_H264_ENABLED + fi + + # 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 -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} + 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 +}