Backport upstream patch to include Chromium (or Google Chrome) in the preferred browsers list wrt #388853 by Michael Mol and Paweł Hajdan, Jr.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 119 insertions, 9 deletions

diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
index 1e613905c4af..f0b99a08e1bc 100644
--- a/xfce-base/exo/ChangeLog
+++ b/xfce-base/exo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/exo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.68 2012/02/20 20:32:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.69 2012/03/01 15:10:21 ssuominen Exp $
+
+*exo-0.6.2-r1 (01 Mar 2012)
+
+  01 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +exo-0.6.2-r1.ebuild,
+  +files/exo-0.6.x-chromium.patch:
+  Backport upstream patch to include Chromium (or Google Chrome) in the
+  preferred browsers list wrt #388853 by Michael Mol and Paweł Hajdan, Jr.
 
 *exo-0.7.1 (20 Feb 2012)
 
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 0a91ecc9f9d7..c4afe68f996a 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX exo-0.6.x-chromium.patch 1154 RMD160 fa19d5c2e2d9770e6273c5bef69d47d7d8f7fa24 SHA1 bf768a007ae189666f54383b308080721cc4a9a7 SHA256 a2cb6f9a2ef0c290b783a0c2ff60aaa65d256d35d94bdf3deecb7b63dd86125f
 DIST exo-0.6.2.tar.bz2 1692288 RMD160 f2c2a713144ffe7e73a6b18925f2323abb334e8c SHA1 2486f12c814630068665e22cdf417f0f0f05dab1 SHA256 f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39
 DIST exo-0.7.1.tar.bz2 1130601 RMD160 d035e46090450ae75e02dfce54aca2f7407a950a SHA1 b98d128cb34776b825b762e1329283edf84ae23b SHA256 e4e767f2d38f4ef0eff8dbe545ee9164e0a2cba371bb9810f9803e81de483a86
+EBUILD exo-0.6.2-r1.ebuild 1622 RMD160 c1fed8fe5adec86faf7a42c2f513393e1eceac38 SHA1 de3da570dc66f7107cc35abc8a720f930e0b87bf SHA256 0b09629fa6224f832ea9bea1b5b3a94abd53f6eb7dd17951e7a5903ea7178f75
 EBUILD exo-0.6.2.ebuild 1539 RMD160 4d22e99c9f0649bcf6fb4cec69b1158585473c69 SHA1 9fab33e183a93e365ef7647fe4794b8c575ba51e SHA256 2be4dba7d151057055a339720c620e42424ad959cea7cef61a8f5435eb6d3ce9
 EBUILD exo-0.7.1.ebuild 1146 RMD160 0a19ce88b4e43419e99830b837d81e26caa17670 SHA1 431921ad7adebe2b962302ea9a2fdc94b0774d3d SHA256 49951931cc1df276f8701b3ea9c9a31a1881bd1d84d9bad844c859da973aa927
-MISC ChangeLog 8479 RMD160 dfea66a0278fdb7b65ca29a3ba7f5e773648e03b SHA1 cb0e0b66738a37319ff5cfe980d780aa20624810 SHA256 1284d336edb4772a8d4e5f856901009a4615187d27419a0fce13b8cdc61eafd6
+MISC ChangeLog 8768 RMD160 323f35b1b2fff2a7cd2521d30d4b4c9c0fa0f68a SHA1 84bad5c972230578a2f2d1a15fe68dcaa34b7990 SHA256 940bab56b3433130d6ea95eb0297abe8fdc501cbec16f34942f2774dce4a579c
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPQq0NAAoJEEdUh39IaPFN3wAH/i3goe7hkj2bRgNYPbX21bza
-c62clKcPcK+wZskjr+VlUu1Inpn0BJvenOAeT9o9QCvdoUOsvlnsgK5FBeYLtWrr
-rKdMFLOBCuXtQTv9ZRRMxsU1trf48RR7pmP1dO0h3m4pBr8iduLZCH+TGPM6eoVN
-amLsQHBgZcZ6raroZlMQIZH3rJxcvu03+b05/8FJfDth5d3TC8ZXWcAdj4HjiVbj
-km7HJWUl2amPvUfnlUrLAaJaMVhQ2JD55v3X9HSiHsGkEa9vRvQo6myWQ7DEd0rt
-Z7Gpn5+JmoqR5WPozX8pZ3g8dI0tVi8FKzXOyXkdmu/fHZmm0YhVXb15fL3VPcQ=
-=AL3U
+iQEcBAEBAgAGBQJPT5EzAAoJEEdUh39IaPFNFeoH/3WqGIavIgIl5UE6t8Vg3AaN
+hOMdt/ja0KrH3j/X+phM4L/AA9PfPVZTi8O1AYeDxqFfTz3oQVnSehhnmH0Tg4Px
+5KCh5DAIPu5+itt3N6+EisfSQiFM8zRcchBa9aczZ+Aqi/1epRFm/dxmb87/DCdq
+k8NXXfunwLxgDj/4lyEYj7pCiRkN5bfDDQYHm8AlOx/QViBlQiRbcbs2OSnMgMFd
+ufzKvN6qufO+oMZRXP6tUJGT4vPFVRqD+KX8CHwRUmliPIC9qsIZUHB85LeOx0yJ
+HFCJsHgjORsoJgblhkncx0RnYZgm8f890C3ZOVOfQyieAR2SQCUZh18sLoDkuKc=
+=pnj/
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/exo/exo-0.6.2-r1.ebuild b/xfce-base/exo/exo-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..166113c2bc93
--- /dev/null
+++ b/xfce-base/exo/exo-0.6.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.6.2-r1.ebuild,v 1.1 2012/03/01 15:10:21 ssuominen Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.6"
+EAUTORECONF=yes
+inherit python xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session management support"
+HOMEPAGE="http://www.xfce.org/projects/exo/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug python"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.18
+	dev-perl/URI
+	>=x11-libs/gtk+-2.14:2
+	>=xfce-base/libxfce4util-4.8
+	python? ( >=dev-python/pygtk-2.4 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	PATCHES=( "${FILESDIR}"/${PN}-0.6.x-chromium.patch )
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-static
+		$(use_enable python)
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
+
+	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}
+
+src_prepare() {
+	>py-compile
+	xfconf_src_prepare
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	use python && python_mod_optimize exo-0.6 pyexo.py
+}
+
+pkg_postrm() {
+	xfconf_pkg_postrm
+	use python && python_mod_cleanup exo-0.6 pyexo.py
+}
diff --git a/xfce-base/exo/files/exo-0.6.x-chromium.patch b/xfce-base/exo/files/exo-0.6.x-chromium.patch
new file mode 100644
index 000000000000..d43205396816
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.6.x-chromium.patch
@@ -0,0 +1,37 @@
+From a8bd98bfda679b52b92615984ec3129b1b9469da Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Fri, 10 Feb 2012 21:26:55 +0000
+Subject: Add preferred app helper for Chromium (bug #8398).
+
+---
+diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
+index 052ed2f..b9d292a 100644
+--- a/exo-helper/helpers/Makefile.am
++++ b/exo-helper/helpers/Makefile.am
+@@ -8,6 +8,7 @@ desktop_in_in_files =							\
+ 	Thunar.desktop.in.in						\
+ 	aterm.desktop.in.in						\
+ 	balsa.desktop.in.in						\
++	chromium.desktop.in.in						\
+ 	debian-sensible-browser.desktop.in.in				\
+ 	debian-x-terminal-emulator.desktop.in.in			\
+ 	encompass.desktop.in.in						\
+diff --git a/exo-helper/helpers/chromium.desktop.in.in b/exo-helper/helpers/chromium.desktop.in.in
+new file mode 100644
+index 0000000..a9edf06
+--- a/dev/null
++++ b/exo-helper/helpers/chromium.desktop.in.in
+@@ -0,0 +1,11 @@
++
++[Desktop Entry]
++Version=1.0
++Icon=chromium
++Type=X-XFCE-Helper
++_Name=Chromium
++StartupNotify=true
++X-XFCE-Binaries=chromium;google-chrome;
++X-XFCE-Category=WebBrowser
++X-XFCE-Commands=%B;
++X-XFCE-CommandsWithParameter=%B "%s";
+--
+cgit v0.9.0.2