From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C78C115800A for ; Sat, 2 Sep 2023 09:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E05E42BC01A; Sat, 2 Sep 2023 09:19:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C24AD2BC01A for ; Sat, 2 Sep 2023 09:19:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 998EE340D68 for ; Sat, 2 Sep 2023 09:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17E9510DF for ; Sat, 2 Sep 2023 09:19:41 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1693646324.7a72d0773f343ce9ef358c54926e26ff182613a3.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch x11-wm/xpra/xpra-4.4.6-r1.ebuild x11-wm/xpra/xpra-4.4.6-r2.ebuild X-VCS-Directories: x11-wm/xpra/ x11-wm/xpra/files/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 7a72d0773f343ce9ef358c54926e26ff182613a3 X-VCS-Branch: master Date: Sat, 2 Sep 2023 09:19:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ebd4379-ed5e-482e-929d-600423c4f107 X-Archives-Hash: a88bc4f5c9d59c5b6da1cc95ce9fa47a commit: 7a72d0773f343ce9ef358c54926e26ff182613a3 Author: Benda Xu gentoo org> AuthorDate: Sat Sep 2 09:17:49 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Sat Sep 2 09:18:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72d077 x11-wm/xpra: drop systemd-run call for USE=minimal. Signed-off-by: Benda Xu gentoo.org> x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch | 18 ++++++++++++++++++ .../{xpra-4.4.6-r1.ebuild => xpra-4.4.6-r2.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 similarity index 98% rename from x11-wm/xpra/xpra-4.4.6-r1.ebuild rename to 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() {