diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2013-08-30 08:36:50 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2013-08-30 08:36:50 +0000 |
| commit | e90799749e890f4565998a446d5d041b82eba41f (patch) | |
| tree | fd66dde2b8a9d457b31fdcebef71479d4f324145 /x11-wm/xpra | |
| parent | Version bump to 4.0.5.2 and 4.1.1.2. (diff) | |
| download | gentoo-2-e90799749e890f4565998a446d5d041b82eba41f.tar.gz gentoo-2-e90799749e890f4565998a446d5d041b82eba41f.tar.bz2 gentoo-2-e90799749e890f4565998a446d5d041b82eba41f.zip | |
patch runtime /etc directory for Prefix. bug 482988. Thanks to Michael for reviewing.
(Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-wm/xpra')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/xpra/files/xpra-0.10.1-prefix.patch | 30 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.10.1.ebuild | 4 |
3 files changed, 38 insertions, 3 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 892d1bf21b45..45ff2da0687d 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.79 2013/08/22 06:46:07 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.80 2013/08/30 08:36:50 heroxbd Exp $ + + 30 Aug 2013; Benda Xu <heroxbd@gentoo.org> +files/xpra-0.10.1-prefix.patch, + xpra-0.10.1.ebuild: + patch runtime /etc directory for Prefix. bug 482988. Thanks to Michael for + reviewing. *xpra-0.10.1 (22 Aug 2013) diff --git a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch new file mode 100644 index 000000000000..1e8e759abaca --- /dev/null +++ b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch @@ -0,0 +1,30 @@ +Index: xpra-0.10.1/setup.py +=================================================================== +--- xpra-0.10.1.orig/setup.py ++++ xpra-0.10.1/setup.py +@@ -896,8 +896,8 @@ else: + return {} + if "install" in sys.argv: + #prepare default [/usr/local]/etc configuration files: +- if sys.prefix == '/usr': +- etc_prefix = '/etc/xpra' ++ if sys.prefix[-4:] == '/usr': ++ etc_prefix = sys.prefix[:-4] + '/etc/xpra' + else: + etc_prefix = sys.prefix + '/etc/xpra' + +Index: xpra-0.10.1/xpra/scripts/config.py +=================================================================== +--- xpra-0.10.1.orig/xpra/scripts/config.py ++++ xpra-0.10.1/xpra/scripts/config.py +@@ -344,8 +344,8 @@ def read_xpra_defaults(): + #first, read the global defaults: + if sys.platform.startswith("win"): + conf_dir = os.path.dirname(os.path.abspath(sys.executable)) +- elif sys.prefix == '/usr': +- conf_dir = '/etc/xpra' ++ elif sys.prefix[-4:] == '/usr': ++ conf_dir = sys.prefix[:-4] + '/etc/xpra' + else: + conf_dir = sys.prefix + '/etc/xpra/' + defaults = read_xpra_conf(conf_dir) diff --git a/x11-wm/xpra/xpra-0.10.1.ebuild b/x11-wm/xpra/xpra-0.10.1.ebuild index 07038387d23e..b752bda32cc3 100644 --- a/x11-wm/xpra/xpra-0.10.1.ebuild +++ b/x11-wm/xpra/xpra-0.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.1.ebuild,v 1.1 2013/08/22 06:46:07 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.1.ebuild,v 1.2 2013/08/30 08:36:50 heroxbd Exp $ EAPI=5 @@ -63,7 +63,7 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch \ "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \ - "${FILESDIR}"/${PN}-0.8.0-prefix.patch + "${FILESDIR}"/${PN}-0.10.1-prefix.patch #assuming ffmpeg and libav mutual exclusive installs if has_version "media-video/libav" ; then |