diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2019-12-16 22:11:14 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2019-12-16 22:11:27 +0800 |
| commit | c4e62235cc5085750be9c498b95570f785cf2049 (patch) | |
| tree | fa545e3a54a52ada1540363485405bda01b42ca5 /x11-wm | |
| parent | net-misc/icaclient: Removed old (diff) | |
| download | gentoo-c4e62235cc5085750be9c498b95570f785cf2049.tar.gz gentoo-c4e62235cc5085750be9c498b95570f785cf2049.tar.bz2 gentoo-c4e62235cc5085750be9c498b95570f785cf2049.zip | |
x11-wm/xpra: fix for USE=-dbus.
This patch allows xpra to be started without Python dbus module when
USE=-dbus.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/files/xpra-3.0.2-dbus.patch | 29 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-3.0.2.ebuild | 2 |
2 files changed, 31 insertions, 0 deletions
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch new file mode 100644 index 000000000000..e0f14b8ba59d --- /dev/null +++ b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch @@ -0,0 +1,29 @@ +Remove dbus functionality if USE=dbus is not specified. + +Index: xpra-3.0.2/xpra/scripts/server.py +=================================================================== +--- xpra-3.0.2.orig/xpra/scripts/server.py ++++ xpra-3.0.2/xpra/scripts/server.py +@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode, + log("chdir(%s)", opts.chdir) + os.chdir(opts.chdir) + +- dbus_pid, dbus_env = 0, {} + if not shadowing and POSIX and not OSX and not clobber: + no_gtk() + assert starting or starting_desktop or proxying +- from xpra.server.dbus.dbus_start import start_dbus +- dbus_pid, dbus_env = start_dbus(opts.dbus_launch) +- if dbus_env: +- os.environ.update(dbus_env) + + display = None + if not proxying: +@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode, + app.display_name = display_name + app.init(opts) + app.init_sockets(sockets) +- app.init_dbus(dbus_pid, dbus_env) + if not shadowing and (xvfb_pid or clobber): + app.init_display_pid(xvfb_pid) + app.original_desktop_display = desktop_display diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild index c57900d96ee6..f3cb1bc10dec 100644 --- a/x11-wm/xpra/xpra-3.0.2.ebuild +++ b/x11-wm/xpra/xpra-3.0.2.ebuild @@ -97,6 +97,8 @@ pkg_postinst() { } python_prepare_all() { + use dbus || eapply ${FILESDIR}/${PN}-3.0.2-dbus.patch + hprefixify -w '/os.path/' setup.py hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py |