| 1 |
commit: 476fe322e0793d7671738ee0350de3b872b60d97 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 28 23:04:43 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 28 23:05:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fe322 |
| 7 |
|
| 8 |
x11-wm/xpra: Don't install service files by patching instead |
| 9 |
|
| 10 |
Auto-detection is used to determine what files to install, and where, which can |
| 11 |
be unpredictable, hence my earlier fix broke. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/834336 |
| 14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 15 |
|
| 16 |
x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 +++++++++++++++++++ |
| 17 |
x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 +++++++++++++++++++ |
| 18 |
x11-wm/xpra/xpra-4.2.ebuild | 4 +--- |
| 19 |
x11-wm/xpra/xpra-4.3.2.ebuild | 4 +--- |
| 20 |
4 files changed, 40 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch |
| 23 |
new file mode 100644 |
| 24 |
index 000000000000..dd85370968ba |
| 25 |
--- /dev/null |
| 26 |
+++ b/x11-wm/xpra/files/xpra-4.2-no-service.patch |
| 27 |
@@ -0,0 +1,19 @@ |
| 28 |
+Don't install the service files. Auto-detection is used to determine what files |
| 29 |
+to install, and where, which can be unpredictable on Gentoo. The init.d script |
| 30 |
+is also not suitable for Gentoo. |
| 31 |
+ |
| 32 |
+diff --git a/setup.py b/setup.py |
| 33 |
+index 1718b06a9..b24a5bd1e 100755 |
| 34 |
+--- a/setup.py |
| 35 |
++++ b/setup.py |
| 36 |
+@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED |
| 37 |
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT |
| 38 |
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT |
| 39 |
+ rfb_ENABLED = server_ENABLED |
| 40 |
+-service_ENABLED = LINUX and server_ENABLED |
| 41 |
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") |
| 42 |
++service_ENABLED = False |
| 43 |
++sd_listen_ENABLED = False |
| 44 |
+ proxy_ENABLED = DEFAULT |
| 45 |
+ client_ENABLED = DEFAULT |
| 46 |
+ scripts_ENABLED = not WIN32 |
| 47 |
|
| 48 |
diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch b/x11-wm/xpra/files/xpra-4.3-no-service.patch |
| 49 |
new file mode 100644 |
| 50 |
index 000000000000..b336db581953 |
| 51 |
--- /dev/null |
| 52 |
+++ b/x11-wm/xpra/files/xpra-4.3-no-service.patch |
| 53 |
@@ -0,0 +1,19 @@ |
| 54 |
+Don't install the service files. Auto-detection is used to determine what files |
| 55 |
+to install, and where, which can be unpredictable on Gentoo. The init.d script |
| 56 |
+is also not suitable for Gentoo. |
| 57 |
+ |
| 58 |
+diff --git a/setup.py b/setup.py |
| 59 |
+index fc67abb50..a11dc0d97 100755 |
| 60 |
+--- a/setup.py |
| 61 |
++++ b/setup.py |
| 62 |
+@@ -145,8 +145,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED |
| 63 |
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT |
| 64 |
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT |
| 65 |
+ rfb_ENABLED = DEFAULT |
| 66 |
+-service_ENABLED = LINUX and server_ENABLED |
| 67 |
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") |
| 68 |
++service_ENABLED = False |
| 69 |
++sd_listen_ENABLED = False |
| 70 |
+ proxy_ENABLED = DEFAULT |
| 71 |
+ client_ENABLED = DEFAULT |
| 72 |
+ scripts_ENABLED = not WIN32 |
| 73 |
|
| 74 |
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild |
| 75 |
index 681a6c97aab5..c42097bb561a 100644 |
| 76 |
--- a/x11-wm/xpra/xpra-4.2.ebuild |
| 77 |
+++ b/x11-wm/xpra/xpra-4.2.ebuild |
| 78 |
@@ -96,6 +96,7 @@ PATCHES=( |
| 79 |
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
| 80 |
"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch |
| 81 |
"${FILESDIR}"/${PN}-4.2-suid-warning.patch |
| 82 |
+ "${FILESDIR}"/${PN}-4.2-no-service.patch |
| 83 |
) |
| 84 |
|
| 85 |
python_prepare_all() { |
| 86 |
@@ -161,9 +162,6 @@ python_install_all() { |
| 87 |
local dir=$(get_udevdir) |
| 88 |
dodir "${dir%/*}" |
| 89 |
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 90 |
- |
| 91 |
- # TODO: Write a Gentoo init script. |
| 92 |
- rm -r "${ED}"/etc/{init.d,sysconfig}/ || die |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
| 96 |
|
| 97 |
diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild |
| 98 |
index 84c10467c081..071992dfdb79 100644 |
| 99 |
--- a/x11-wm/xpra/xpra-4.3.2.ebuild |
| 100 |
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild |
| 101 |
@@ -110,6 +110,7 @@ RESTRICT="!test? ( test )" |
| 102 |
PATCHES=( |
| 103 |
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
| 104 |
"${FILESDIR}"/${PN}-4.2-suid-warning.patch |
| 105 |
+ "${FILESDIR}"/${PN}-4.3-no-service.patch |
| 106 |
"${DISTDIR}"/${PN}-4.3.1-tests.patch |
| 107 |
) |
| 108 |
|
| 109 |
@@ -188,9 +189,6 @@ python_install_all() { |
| 110 |
local dir=$(get_udevdir) |
| 111 |
dodir "${dir%/*}" |
| 112 |
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 113 |
- |
| 114 |
- # TODO: Write a Gentoo init script. |
| 115 |
- rm -r "${ED}"/etc/{init.d,sysconfig}/ || die |
| 116 |
} |
| 117 |
|
| 118 |
pkg_postinst() { |
Archives