diff options
| author |   Michael Weber <xmw@gentoo.org> | 2016-02-22 14:34:38 +0100 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2016-02-22 14:37:24 +0100 |
| commit | dd59b94f89dc4959162efbf82c49f58914e4ed0d (patch) | |
| tree | a2c1bc67b64d38e799ac120f2e55ad389573bb94 /x11-wm/xpra/files | |
| parent | x11-wm/xpra: Version bump to latest 0.14 (diff) | |
| download | gentoo-dd59b94f89dc4959162efbf82c49f58914e4ed0d.tar.gz gentoo-dd59b94f89dc4959162efbf82c49f58914e4ed0d.tar.bz2 gentoo-dd59b94f89dc4959162efbf82c49f58914e4ed0d.zip | |
x11-wm/xpra: Version bump.
Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-wm/xpra/files')
| -rw-r--r-- | x11-wm/xpra/files/xpra-0.16.2-prefix.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/x11-wm/xpra/files/xpra-0.16.2-prefix.patch b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch new file mode 100644 index 000000000000..4559578d63ce --- /dev/null +++ b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch @@ -0,0 +1,27 @@ +--- xpra-0.16.2/setup.py ++++ xpra-0.16.2/setup.py +@@ -1723,8 +1723,8 @@ + #prepare default [/usr/local]/etc configuration files: + if '--user' in sys.argv: + etc_prefix = 'etc/xpra' +- elif sys.prefix == '/usr': +- etc_prefix = '/etc/xpra' ++ elif sys.prefix[-4:] == '/usr': ++ etc_prefix = sys.prefix[:-4] + '/etc/xpra' + else: + etc_prefix = sys.prefix + '/etc/xpra' + +--- xpra-0.16.2/xpra/platform/paths.py ++++ xpra-0.16.2/xpra/platform/paths.py +@@ -40,9 +40,9 @@ + def do_get_system_conf_dirs(): + prefix = get_install_prefix() + #the system wide configuration directory +- if prefix == '/usr': ++ if prefix[-4:] == '/usr': + #default posix config location: +- return ['/etc/xpra'] ++ return [sys.prefix[:-4] + '/etc/xpra'] + #hope the prefix is something like "/usr/local" or "$HOME/.local": + return [prefix + '/etc/xpra/'] + |