diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2023-05-16 23:12:08 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2023-05-16 23:12:08 +0100 |
| commit | 3102cd8d6d3e1e22e1f1f2820fef94a0965c7166 (patch) | |
| tree | 60805c349b1ba1e02e4ce025259e750d57c803a8 /x11-wm/xpra | |
| parent | x11-wm/xpra: remove unused patch (diff) | |
| download | gentoo-3102cd8d6d3e1e22e1f1f2820fef94a0965c7166.tar.gz gentoo-3102cd8d6d3e1e22e1f1f2820fef94a0965c7166.tar.bz2 gentoo-3102cd8d6d3e1e22e1f1f2820fef94a0965c7166.zip | |
x11-wm/xpra: Use setup.py args to avoid sd_listen/service files
I didn't realise I could have done this without a patch.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'x11-wm/xpra')
| -rw-r--r-- | x11-wm/xpra/files/xpra-4.5-no-service.patch | 19 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-4.4.4.ebuild | 3 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-9999.ebuild | 3 |
3 files changed, 4 insertions, 21 deletions
diff --git a/x11-wm/xpra/files/xpra-4.5-no-service.patch b/x11-wm/xpra/files/xpra-4.5-no-service.patch deleted file mode 100644 index 329c492784ac..000000000000 --- a/x11-wm/xpra/files/xpra-4.5-no-service.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 529b591b1..ad23d6ecc 100755 ---- a/setup.py -+++ b/setup.py -@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT - quic_ENABLED = DEFAULT - ssh_ENABLED = DEFAULT - http_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 diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild index e458911550a1..1111ef2fc4e3 100644 --- a/x11-wm/xpra/xpra-4.4.4.ebuild +++ b/x11-wm/xpra/xpra-4.4.4.ebuild @@ -115,7 +115,6 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-4.3-no-service.patch "${FILESDIR}"/${PN}-4.4-xdummy.patch ) @@ -161,6 +160,8 @@ python_configure_all() { $(use_with jpeg jpeg_encoder) $(use_with jpeg jpeg_decoder) --without-mdns + --without-sd_listen + --without-service $(use_with opengl) $(use_with server shadow) $(use_with server) diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index b2d368301a68..23c923b710aa 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -115,7 +115,6 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-4.5-no-service.patch "${FILESDIR}"/${PN}-9999-xdummy.patch "${FILESDIR}"/${PN}-9999-tests.patch ) @@ -163,6 +162,8 @@ python_configure_all() { $(use_with jpeg jpeg_encoder) $(use_with jpeg jpeg_decoder) --without-mdns + --without-sd_listen + --without-service $(use_with opengl) $(use_with server shadow) $(use_with server) |