Make gconf dependency optional.

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 416 insertions, 3 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 03ccb975bd27..f9243f683491 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.218 2010/11/07 14:37:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.219 2010/11/07 17:41:17 phajdan.jr Exp $
+
+*chromium-9.0.570.0-r1 (07 Nov 2010)
+
+  07 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-gconf-optional-r0.patch, +chromium-9.0.570.0-r1.ebuild,
+  chromium-9999.ebuild:
+  Make gconf dependency optional.
 
   07 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-9.0.570.0.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/chromium-9.0.570.0-r1.ebuild b/www-client/chromium/chromium-9.0.570.0-r1.ebuild
new file mode 100644
index 000000000000..7afe6687c56a
--- /dev/null
+++ b/www-client/chromium/chromium-9.0.570.0-r1.ebuild
@@ -0,0 +1,277 @@
+# 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-9.0.570.0-r1.ebuild,v 1.1 2010/11/07 17:41:17 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils flag-o-matic multilib pax-utils python 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 +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
+
+RDEPEND="app-arch/bzip2
+	system-sqlite? (
+		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
+	)
+	system-v8? ( ~dev-lang/v8-2.5.2 )
+	>=dev-libs/icu-4.4.1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	gnome? ( >=gnome-base/gconf-2.24.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg:0
+	media-libs/libpng
+	>=media-video/ffmpeg-0.6_p25423[threads]
+	cups? ( >=net-print/cups-1.3.11 )
+	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
+	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
+	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
+
+remove_bundled_lib() {
+	einfo "Removing bundled library $1 ..."
+	local out
+	out="$(find $1 -type f \! -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
+}
+
+pkg_setup() {
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Enable optional support for gecko-mediaplayer.
+	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
+
+	# Make GConf dependency optional, http://crbug.com/13322.
+	epatch "${FILESDIR}"/${PN}-gconf-optional-r0.patch
+
+	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/codesighs"
+	remove_bundled_lib "third_party/icu"
+	remove_bundled_lib "third_party/jemalloc"
+	remove_bundled_lib "third_party/lcov"
+	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"
+	remove_bundled_lib "third_party/lzma_sdk"
+	remove_bundled_lib "third_party/molokocacao"
+	remove_bundled_lib "third_party/ocmock"
+	remove_bundled_lib "third_party/pyftpdlib"
+	remove_bundled_lib "third_party/simplejson"
+	remove_bundled_lib "third_party/tlslite"
+	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+
+	if use system-sqlite; then
+		remove_bundled_lib "third_party/sqlite/src"
+		remove_bundled_lib "third_party/sqlite/preprocessed"
+	fi
+
+	if use system-v8; then
+		# Provide our own gyp file that links with the system v8.
+		# TODO: move this upstream.
+		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+		remove_bundled_lib "v8"
+
+		# The implementation files include v8 headers with full path,
+		# like #include "v8/include/v8.h". Make sure the system headers
+		# will be used.
+		# TODO: find a solution that can be upstreamed.
+		rmdir v8/include || die
+		ln -s /usr/include v8/include || die
+	fi
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	for dir in build tools; do
+		python_convert_shebangs -q -r 2 "${dir}"
+	done
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl (need to consult upstream).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
+		-Duse_system_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libxml=1
+		-Duse_system_zlib=1"
+
+	if use system-sqlite; then
+		myconf+=" -Duse_system_sqlite=1"
+	fi
+
+	# The dependency on cups is optional, see bug #324105.
+	if use cups; then
+		myconf+=" -Duse_cups=1"
+	else
+		myconf+=" -Duse_cups=0"
+	fi
+
+	# Make GConf dependency optional, http://crbug.com/13322.
+	if use gnome; then
+		myconf+=" -Duse_gconf=1"
+	else
+		myconf+=" -Duse_gconf=0"
+	fi
+
+	if use "gnome-keyring"; then
+		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
+	else
+		# TODO: we should also disable code trying to dlopen
+		# gnome-keyring in that case.
+		myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
+	fi
+
+	# Enable sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	if host-is-pax; then
+		# Prevent the build from failing (bug #301880). The performance
+		# difference is very small.
+		myconf+=" -Dv8_use_snapshot=0"
+	fi
+
+	if use gecko-mediaplayer; then
+		# Disable hardcoded blacklist for gecko-mediaplayer.
+		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
+		# the browser to hang. We can handle the situation via dependencies,
+		# thus making it possible to use gecko-mediaplayer.
+		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
+	fi
+
+	# Our system ffmpeg should support more codecs than the bundled one
+	# for Chromium.
+	myconf+=" -Dproprietary_codecs=1"
+
+	# Use target arch detection logic from bug #296917.
+	local myarch="$ABI"
+	[[ $myarch = "" ]] && myarch="$ARCH"
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: check this again after
+		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
+		append-flags -fno-tree-sink
+
+		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+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	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+=" -Dwerror="
+
+	build/gyp_chromium --depth=. ${myconf} || die
+}
+
+src_compile() {
+	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	pax-mark m out/Release/chrome
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	doexe out/Release/xdg-settings || die
+	doexe "${FILESDIR}"/chromium-launcher.sh || die
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/chrome.pak || die
+	doins out/Release/resources.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	# chrome.1 is for chromium --help
+	newman out/Release/chrome.1 chrome.1 || die
+	newman out/Release/chrome.1 chromium.1 || die
+
+	# 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}" || die
+	dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
+	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
+
+	# Install icon and desktop entry.
+	newicon out/Release/product_logo_48.png ${PN}-browser.png || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
+		"MimeType=text/html;text/xml;application/xhtml+xml;"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		doins "${FILESDIR}"/chromium.xml || die
+	fi
+}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 59d330082a38..68efae9330dc 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.102 2010/11/07 14:37:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.103 2010/11/07 17:41:17 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -28,7 +28,7 @@ RDEPEND="app-arch/bzip2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
+	gnome? ( >=gnome-base/gconf-2.24.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
@@ -122,6 +122,9 @@ src_prepare() {
 	# Enable optional support for gecko-mediaplayer.
 	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
 
+	# Make GConf dependency optional, http://crbug.com/13322.
+	epatch "${FILESDIR}"/${PN}-gconf-optional-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/icu"
@@ -200,6 +203,13 @@ src_configure() {
 		myconf+=" -Duse_cups=0"
 	fi
 
+	# Make GConf dependency optional, http://crbug.com/13322.
+	if use gnome; then
+		myconf+=" -Duse_gconf=1"
+	else
+		myconf+=" -Duse_gconf=0"
+	fi
+
 	if use "gnome-keyring"; then
 		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
 	else
diff --git a/www-client/chromium/files/chromium-gconf-optional-r0.patch b/www-client/chromium/files/chromium-gconf-optional-r0.patch
new file mode 100644
index 000000000000..26e219685777
--- /dev/null
+++ b/www-client/chromium/files/chromium-gconf-optional-r0.patch
@@ -0,0 +1,119 @@
+--- net/proxy/proxy_config_service_linux.cc.orig	2010-11-07 15:14:52.000000000 +0000
++++ net/proxy/proxy_config_service_linux.cc	2010-11-07 15:21:16.000000000 +0000
+@@ -6,7 +6,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(USE_GCONF)
+ #include <gconf/gconf-client.h>
++#endif
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -185,6 +187,7 @@
+ 
+ const int kDebounceTimeoutMilliseconds = 250;
+ 
++#if defined(USE_GCONF)
+ // This is the "real" gconf version that actually uses gconf.
+ class GConfSettingGetterImplGConf
+     : public ProxyConfigServiceLinux::GConfSettingGetter {
+@@ -419,6 +422,7 @@
+ 
+   DISALLOW_COPY_AND_ASSIGN(GConfSettingGetterImplGConf);
+ };
++#endif  // defined(USE_GCONF)
+ 
+ // This is the KDE version that reads kioslaverc and simulates gconf.
+ // Doing this allows the main Delegate code, as well as the unit tests
+@@ -1064,7 +1068,9 @@
+   // Figure out which GConfSettingGetterImpl to use, if any.
+   switch (base::nix::GetDesktopEnvironment(env_var_getter)) {
+     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
++#if defined(USE_GCONF)
+       gconf_getter_.reset(new GConfSettingGetterImplGConf());
++#endif
+       break;
+     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
+--- chrome/browser/gtk/browser_titlebar.cc.orig	2010-11-07 15:55:54.000000000 +0000
++++ chrome/browser/gtk/browser_titlebar.cc	2010-11-07 15:57:39.000000000 +0000
+@@ -23,7 +23,9 @@
+ #include "chrome/browser/gtk/accelerators_gtk.h"
+ #include "chrome/browser/gtk/browser_window_gtk.h"
+ #include "chrome/browser/gtk/custom_button.h"
++#if defined(USE_GCONF)
+ #include "chrome/browser/gtk/gconf_titlebar_listener.h"
++#endif
+ #include "chrome/browser/gtk/gtk_theme_provider.h"
+ #include "chrome/browser/gtk/gtk_util.h"
+ #include "chrome/browser/gtk/menu_gtk.h"
+@@ -299,9 +301,13 @@
+   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
+                    FALSE, FALSE, 0);
+ 
++#if defined(USE_GCONF)
+   // Either read the gconf database and register for updates (on GNOME), or use
+   // the default value (anywhere else).
+   Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
++#else
++  BuildButtons(":minimize,maximize,close");
++#endif
+ 
+   // We use an alignment to control the titlebar height.
+   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
+@@ -363,7 +369,9 @@
+ 
+ BrowserTitlebar::~BrowserTitlebar() {
+   ActiveWindowWatcherX::RemoveObserver(this);
++#if defined(USE_GCONF)
+   Singleton<GConfTitlebarListener>()->RemoveObserver(this);
++#endif
+ }
+ 
+ void BrowserTitlebar::BuildButtons(const std::string& button_string) {
+--- build/common.gypi.orig	2010-11-07 14:55:25.000000000 +0000
++++ build/common.gypi	2010-11-07 14:57:31.000000000 +0000
+@@ -314,6 +314,9 @@
+     # whether to compile in the sources for the GPU plugin / process.
+     'enable_gpu%': 1,
+ 
++    # Use GConf, the GNOME configuration system.
++    'use_gconf%': 1,
++
+     # Use OpenSSL instead of NSS. Currently in development.
+     'use_openssl%': 0,
+ 
+--- build/linux/system.gyp.orig	2010-11-07 16:34:57.000000000 +0000
++++ build/linux/system.gyp	2010-11-07 16:35:55.000000000 +0000
+@@ -188,11 +188,14 @@
+       'target_name': 'gconf',
+       'type': 'settings',
+       'conditions': [
+-        ['_toolset=="target"', {
++        ['use_gconf==1 and _toolset=="target"', {
+           'direct_dependent_settings': {
+             'cflags': [
+               '<!@(<(pkg-config) --cflags gconf-2.0)',
+             ],
++            'defines': [
++              'USE_GCONF',
++            ],
+           },
+           'link_settings': {
+             'ldflags': [
+--- chrome/chrome_browser.gypi.orig	2010-11-07 15:53:31.000000000 +0000
++++ chrome/chrome_browser.gypi	2010-11-07 15:55:04.000000000 +0000
+@@ -3393,6 +3393,12 @@
+             ],
+           },
+         }],
++	['use_gconf==0', {
++	  'sources!': [
++            'browser/gtk/gconf_titlebar_listener.cc',
++            'browser/gtk/gconf_titlebar_listener.h',
++	  ],
++	}],
+         ['use_gnome_keyring==0', {
+           'sources!': [
+             'browser/password_manager/native_backend_gnome_x.h',