summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-08-17 21:57:14 +0000
committerMike Gilbert <floppym@gentoo.org>2012-08-17 21:57:14 +0000
commitce47f7e6219353617d76a19cd802b4000bed7d51 (patch)
treea3e5025f2ab0345614708fa745022d84fe33170e /www-client
parentApply fix against gtk-3.4. Bug #424747. Thanks to Francisco Vazquez <fjvazque... (diff)
downloadgentoo-2-ce47f7e6219353617d76a19cd802b4000bed7d51.tar.gz
gentoo-2-ce47f7e6219353617d76a19cd802b4000bed7d51.tar.bz2
gentoo-2-ce47f7e6219353617d76a19cd802b4000bed7d51.zip
Version bump for beta channel release.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-21.0.1180.81.ebuild (renamed from www-client/chromium/chromium-21.0.1180.75.ebuild)14
2 files changed, 16 insertions, 6 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d6fe55ccebe3..1bd125a05469 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.696 2012/08/17 19:52:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.697 2012/08/17 21:57:14 floppym Exp $
+
+*chromium-21.0.1180.81 (17 Aug 2012)
+
+ 17 Aug 2012; Mike Gilbert <floppym@gentoo.org> +chromium-21.0.1180.81.ebuild,
+ -chromium-21.0.1180.75.ebuild:
+ Version bump for beta channel release.
*chromium-22.0.1229.8 (17 Aug 2012)
diff --git a/www-client/chromium/chromium-21.0.1180.75.ebuild b/www-client/chromium/chromium-21.0.1180.81.ebuild
index a559c03b35a3..5d2ba988cfb5 100644
--- a/www-client/chromium/chromium-21.0.1180.75.ebuild
+++ b/www-client/chromium/chromium-21.0.1180.81.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.75.ebuild,v 1.1 2012/08/08 00:05:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.81.ebuild,v 1.1 2012/08/17 21:57:14 floppym Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -28,7 +28,7 @@ RDEPEND="app-arch/bzip2
)
>=dev-lang/v8-3.11.10.6
dev-libs/dbus-glib
- dev-libs/elfutils
+ >=dev-libs/elfutils-0.149
dev-libs/expat
>=dev-libs/icu-49.1.1-r1
>=dev-libs/libevent-1.4.13
@@ -41,6 +41,7 @@ RDEPEND="app-arch/bzip2
media-libs/flac
>=media-libs/libjpeg-turbo-1.2.0-r1
media-libs/libpng
+ >=media-libs/libwebp-0.2.0_rc1
media-libs/speex
pulseaudio? ( media-sound/pulseaudio )
sys-fs/udev
@@ -138,7 +139,6 @@ src_prepare() {
\! -path 'third_party/libsrtp/*' \
\! -path 'third_party/libusb/libusb.h' \
\! -path 'third_party/libvpx/*' \
- \! -path 'third_party/libwebp/*' \
\! -path 'third_party/libxml/chromium/*' \
\! -path 'third_party/libyuv/*' \
\! -path 'third_party/lss/*' \
@@ -208,8 +208,6 @@ src_configure() {
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
# TODO: use_system_vpx
- # TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
- # needs to become part of webp release)
myconf+="
-Duse_system_bzip2=1
-Duse_system_flac=1
@@ -218,6 +216,7 @@ src_configure() {
-Duse_system_libjpeg=1
-Duse_system_libpng=1
-Duse_system_libusb=1
+ -Duse_system_libwebp=1
-Duse_system_libxml=1
-Duse_system_speex=1
-Duse_system_v8=1
@@ -236,6 +235,11 @@ src_configure() {
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
+ # Use explicit library dependencies instead of dlopen.
+ # This makes breakages easier to detect by revdep-rebuild.
+ myconf+="
+ -Dlinux_link_gsettings=1"
+
if ! use selinux; then
# Enable SUID sandbox.
myconf+="