summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-21 07:12:46 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-21 07:12:46 +0000
commit2febe664f17b41fe945f5f5607e5935f6b8f264e (patch)
tree5f9a8ca515d39b1a548522e9fc89df7ae7c60994 /www-client/chromium
parentMask www-client/chromium dev channel release. (diff)
downloadhistorical-2febe664f17b41fe945f5f5607e5935f6b8f264e.tar.gz
historical-2febe664f17b41fe945f5f5607e5935f6b8f264e.tar.bz2
historical-2febe664f17b41fe945f5f5607e5935f6b8f264e.zip
Version bump for dev channel release.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/Manifest14
-rw-r--r--www-client/chromium/chromium-6.0.437.3.ebuild209
3 files changed, 219 insertions, 12 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9cc2815e1a15..92b0dfacae73 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.122 2010/06/20 17:19:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.123 2010/06/21 07:12:46 phajdan.jr Exp $
+
+*chromium-6.0.437.3 (21 Jun 2010)
+
+ 21 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ +chromium-6.0.437.3.ebuild:
+ Version bump for dev channel release.
20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
chromium-5.0.375.70-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 093c49b6c43f..a504ce7201d4 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-disable-vp8-r1.patch 1204 RMD160 22264b89adf908149e5405c316e4666c4eda4ad8 SHA1 7e104772a645f50449432d4c970d52ffc3555c8a SHA256 ebb9031cd447aca0f3d7f9a2b4081f64dd8244ffd90564ecab06724e1dda63e8
AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
@@ -14,17 +11,12 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a
DIST chromium-5.0.375.70.tar.bz2 163191937 RMD160 cb43307d095dc7ba146762b2a997ba32c5c12907 SHA1 96234ce716e5124f8c8ada92ed9a8cbe6183c5ed SHA256 dd2e440b1a230b1adcc8941d825155e5aeaf887fe67702697a845bd459455902
DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e181e2f45a16 SHA1 65897ae8d05e04e821333fca05d77cbe0b08771f SHA256 e5ab816d0b39511d6718c2f76c3436c4db3664c06496fe413273a70864d4f3d8
DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269
+DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e02210796998ccf0069 SHA1 1568aa0e368af02e60ad7746743b332948fbad75 SHA256 88671254bc0a911beefef866ac263a489bf91fca7ad967ad25921ef29b5b8150
EBUILD chromium-5.0.375.70-r1.ebuild 5488 RMD160 205ca5061edb7b0c539e5ca1b49c74c99ba51d36 SHA1 afcd267d652f1ed6bf7f52ad226fda3d7b830959 SHA256 3e819f24058e913f530a060be65d750c48735a160d81b910ae421ddbbdf8e38b
EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a
EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c
EBUILD chromium-6.0.437.1.ebuild 6257 RMD160 794ae41a32cb52b8501b18406e4d48f3ecf4f876 SHA1 1bbd45716b4af4ace3320fcc7c08709459be1a03 SHA256 3a1a0761e5c37b11d5210df3c3b1781f015c08c15dd3b5565851fbf248f26d61
+EBUILD chromium-6.0.437.3.ebuild 6257 RMD160 bf1dd1448258ea55b07f7233a275005939979976 SHA1 a087c10e69e54e70a6098f8109b9cde0d65f9cf3 SHA256 80973e909da829a9815382ed6b54349a7038b890d7fe657cba9739aab6f4e579
EBUILD chromium-9999.ebuild 7897 RMD160 ab9d3fe8bb0b01fd60ed1fb2f26c6c4f1a017b2d SHA1 b0e283bd961c63ce1a6c9e563810c2e602ed3a75 SHA256 48ec2139c73491e4c657629a19d3d0534029d45eb55b67f1718ab950c7c1cbd7
-MISC ChangeLog 27416 RMD160 a47289b3094f8ef3eaeb709f4df3b15b8c6642ed SHA1 6b15cb764d85415dcc97fdc87ca6a4819c1dabb1 SHA256 74aa5114b4112177525ade79d9e2d962537c35d91c9ebc8b9209648c86d01fec
+MISC ChangeLog 27582 RMD160 7122a36b72abb0060987f79a644bf105d74ca769 SHA1 bfe27e0e3cd9dae7425cc8cd40aee8c2e59aa5b3 SHA256 bee313124510773bc13e1a24a70d0c9d3f484013e78cac8da5a7a1fcdbb5b6a4
MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkweUFMACgkQNQqtfCuFneNyswCfQzQFuGwZEPycUGkfQOqFXMAV
-X3gAoIhpztlhtw192If2aXX4QP9ocmBe
-=qjw0
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-6.0.437.3.ebuild b/www-client/chromium/chromium-6.0.437.3.ebuild
new file mode 100644
index 000000000000..7644a9dd890a
--- /dev/null
+++ b/www-client/chromium/chromium-6.0.437.3.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-6.0.437.3.ebuild,v 1.1 2010/06/21 07:12:46 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="cups sse2"
+
+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[threads]
+ cups? ( >=net-print/cups-1.3.5 )
+ sys-libs/zlib
+ >=x11-libs/gtk+-2.14.7
+ x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ >=dev-util/gperf-3.0.3
+ >=dev-util/pkgconfig-0.23
+ >=gnome-base/gnome-keyring-2.28.2
+ 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"
+
+remove_bundled_lib() {
+ einfo "Removing bundled library $1 ..."
+ local out
+ out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+ || die "failed to remove bundled library $1"
+ if [[ -z $out ]]; then
+ die "no files matched when removing bundled library $1"
+ fi
+}
+
+src_prepare() {
+ # Disable VP8 until we have a recent enough system-provided ffmpeg.
+ epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
+
+ # Make dependency on cups optional, bug #324105.
+ epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch
+
+ # Fix gyp files to correctly support system-provided libraries.
+ epatch "${FILESDIR}"/${PN}-gyp-fixes-r2.patch
+
+ remove_bundled_lib "third_party/bzip2"
+ remove_bundled_lib "third_party/libevent"
+ remove_bundled_lib "third_party/libjpeg"
+ remove_bundled_lib "third_party/libpng"
+ remove_bundled_lib "third_party/libxml"
+ remove_bundled_lib "third_party/libxslt"
+ # TODO: also remove third_party/zlib. For now the compilation fails if we
+ # remove it (minizip-related).
+}
+
+src_configure() {
+ export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+ # Workaround for bug #318969.
+ # TODO: remove when http://crbug.com/43778 is fixed.
+ append-flags -D__STDC_CONSTANT_MACROS
+
+ local myconf=""
+
+ # Make it possible to build chromium on non-sse2 systems.
+ if ! use sse2; then
+ myconf="${myconf} -Ddisable_sse2=1"
+ fi
+
+ # Use system-provided libraries.
+ # TODO: use_system_sqlite (http://crbug.com/22208).
+ # TODO: use_system_icu, use_system_hunspell (upstream changes needed).
+ # TODO: use_system_ssl when we have a recent enough system NSS.
+ myconf="${myconf}
+ -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_zlib=1"
+
+ # The system-provided ffmpeg supports more codecs. Enable them in chromium.
+ myconf="${myconf} -Dproprietary_codecs=1"
+
+ # The dependency on cups is optional, see bug #324105.
+ if use cups; then
+ myconf="${myconf} -Duse_cups=1"
+ else
+ myconf="${myconf} -Duse_cups=0"
+ fi
+
+ # Enable sandbox.
+ 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"
+
+ # Disable tcmalloc memory allocator. It causes problems,
+ # for example bug #320419.
+ myconf="${myconf} -Dlinux_use_tcmalloc=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
+ append-flags -fno-tree-sink
+ 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() {
+ 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}
+
+ # Use system plugins by default.
+ dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+
+ # Install 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"
+
+ # Install GNOME default application entry (bug #303100).
+ dodir /usr/share/gnome-control-center/default-apps
+ insinto /usr/share/gnome-control-center/default-apps
+ doins "${FILESDIR}"/chromium.xml
+}