diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-wm/xpra/files | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'x11-wm/xpra/files')
-rw-r--r-- | x11-wm/xpra/files/xpra-3.0.2-dbus.patch | 29 |
1 files changed, 29 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 |