summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2022-02-28 23:04:43 +0000
committerJames Le Cuirot <chewi@gentoo.org>2022-02-28 23:05:41 +0000
commit476fe322e0793d7671738ee0350de3b872b60d97 (patch)
tree860823c6166a4ca78fec6774b7cddca00297ce23 /x11-wm/xpra/files/xpra-4.3-no-service.patch
parentapp-backup/tsm: Fix dependency (diff)
downloadgentoo-476fe322e0793d7671738ee0350de3b872b60d97.tar.gz
gentoo-476fe322e0793d7671738ee0350de3b872b60d97.tar.bz2
gentoo-476fe322e0793d7671738ee0350de3b872b60d97.zip
x11-wm/xpra: Don't install service files by patching instead
Auto-detection is used to determine what files to install, and where, which can be unpredictable, hence my earlier fix broke. Closes: https://bugs.gentoo.org/834336 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'x11-wm/xpra/files/xpra-4.3-no-service.patch')
-rw-r--r--x11-wm/xpra/files/xpra-4.3-no-service.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch b/x11-wm/xpra/files/xpra-4.3-no-service.patch
new file mode 100644
index 000000000000..b336db581953
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index fc67abb50..a11dc0d97 100755
+--- a/setup.py
++++ b/setup.py
+@@ -145,8 +145,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
+ rfb_ENABLED = DEFAULT
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32