diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 16:31:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 16:31:49 +0000 |
| commit | 331f75fbbb93fc808b377243c86f9af2f018d3f9 (patch) | |
| tree | e5ef23ac85a5f75b05aefb3a303e09f75c0bfe49 /xfce-base/exo | |
| parent | Marked ~ppc for bug #313563. (diff) | |
| download | gentoo-2-331f75fbbb93fc808b377243c86f9af2f018d3f9.tar.gz gentoo-2-331f75fbbb93fc808b377243c86f9af2f018d3f9.tar.bz2 gentoo-2-331f75fbbb93fc808b377243c86f9af2f018d3f9.zip | |
Set python_set_active_version to make sure Python 2.x is used. Fix opera-browser.desktop for >= 10.60 wrt #327081 by Christopher Head.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/exo')
| -rw-r--r-- | xfce-base/exo/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/exo/exo-0.5.3.ebuild | 11 | ||||
| -rw-r--r-- | xfce-base/exo/files/exo-0.5.3-opera-10_60.patch | 11 |
3 files changed, 27 insertions, 2 deletions
diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog index 887632340df7..c45f4cd9ed35 100644 --- a/xfce-base/exo/ChangeLog +++ b/xfce-base/exo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/exo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.39 2010/08/10 15:50:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.40 2010/08/11 16:31:48 ssuominen Exp $ + + 11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> exo-0.5.3.ebuild, + +files/exo-0.5.3-opera-10_60.patch: + Set python_set_active_version to make sure Python 2.x is used. Fix + opera-browser.desktop for >= 10.60 wrt #327081 by Christopher Head. 10 Aug 2010; Jeroen Roovers <jer@gentoo.org> exo-0.3.107.ebuild: Stable for HPPA (bug #323729). diff --git a/xfce-base/exo/exo-0.5.3.ebuild b/xfce-base/exo/exo-0.5.3.ebuild index 8ea6d0515876..46cb1c43d567 100644 --- a/xfce-base/exo/exo-0.5.3.ebuild +++ b/xfce-base/exo/exo-0.5.3.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.5.3.ebuild,v 1.1 2010/07/26 15:47:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.5.3.ebuild,v 1.2 2010/08/11 16:31:48 ssuominen Exp $ EAPI=3 + +PYTHON_DEPEND="python? 2" + inherit xfconf python DESCRIPTION="Extensions, widgets and framework library with session management support" @@ -26,6 +29,12 @@ DEPEND="${RDEPEND} sys-devel/gettext" pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi + + PATCHES=( "${FILESDIR}"/${P}-opera-10_60.patch ) XFCONF="--disable-dependency-tracking --disable-static $(use_enable python) diff --git a/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch b/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch new file mode 100644 index 000000000000..3941b14de691 --- /dev/null +++ b/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch @@ -0,0 +1,11 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=6604 +http://bugs.gentoo.org/327081 + +--- exo-helper/helpers/opera-browser.desktop.in.in ++++ exo-helper/helpers/opera-browser.desktop.in.in +@@ -8,4 +8,4 @@ + X-XFCE-Binaries=opera; + X-XFCE-Category=WebBrowser + X-XFCE-Commands=%B; +-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s"; ++X-XFCE-CommandsWithParameter=%B "%s"; |