diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2023-09-02 17:17:49 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2023-09-02 17:18:44 +0800 |
| commit | 7a72d0773f343ce9ef358c54926e26ff182613a3 (patch) | |
| tree | f56aa8d2b6a5f6b39c9cd8cf1d9960f97909f540 /x11-wm | |
| parent | sys-firmware/firmware-imx: Version bump to 8.17, EAPI 8 (diff) | |
| download | gentoo-7a72d0773f343ce9ef358c54926e26ff182613a3.tar.gz gentoo-7a72d0773f343ce9ef358c54926e26ff182613a3.tar.bz2 gentoo-7a72d0773f343ce9ef358c54926e26ff182613a3.zip | |
x11-wm/xpra: drop systemd-run call for USE=minimal.
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch | 18 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-4.4.6-r2.ebuild (renamed from x11-wm/xpra/xpra-4.4.6-r1.ebuild) | 13 |
2 files changed, 25 insertions, 6 deletions
diff --git a/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch new file mode 100644 index 000000000000..78a4cccb3684 --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch @@ -0,0 +1,18 @@ +Xpra is a good piece of software except that some features are not +useful only to introduce unnecessary dependencies. + +Forwarded: no need. + +Index: xpra-4.4.6/xpra/scripts/main.py +=================================================================== +--- xpra-4.4.6.orig/xpra/scripts/main.py ++++ xpra-4.4.6/xpra/scripts/main.py +@@ -64,7 +64,7 @@ CLIPBOARD_CLASS = os.environ.get("XPRA_C + WAIT_SERVER_TIMEOUT = envint("WAIT_SERVER_TIMEOUT", 90) + CONNECT_TIMEOUT = envint("XPRA_CONNECT_TIMEOUT", 20) + OPENGL_PROBE_TIMEOUT = envint("XPRA_OPENGL_PROBE_TIMEOUT", 5) +-SYSTEMD_RUN = envbool("XPRA_SYSTEMD_RUN", True) ++SYSTEMD_RUN = False + VERIFY_X11_SOCKET_TIMEOUT = envint("XPRA_VERIFY_X11_SOCKET_TIMEOUT", 1) + LIST_REPROBE_TIMEOUT = envint("XPRA_LIST_REPROBE_TIMEOUT", 10) + diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild index b9dcf632b0fc..5ec14d265625 100644 --- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild @@ -121,18 +121,19 @@ PATCHES=( ) python_prepare_all() { + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch ) + fi + distutils-r1_python_prepare_all hprefixify xpra/scripts/config.py sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi } python_configure_all() { |