1 |
commit: e11d7375480a0b0a7199d3fcbcf8e2cefb0c5f77 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 30 07:53:59 2021 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 30 07:56:17 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11d7375 |
7 |
|
8 |
x11-wm/xpra: Version bump to 4.2 |
9 |
|
10 |
Adds ibus and pinentry USE flags. |
11 |
|
12 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
14 |
|
15 |
x11-wm/xpra/Manifest | 1 + |
16 |
x11-wm/xpra/files/xpra-4.2-suid-warning.patch | 12 ++ |
17 |
x11-wm/xpra/metadata.xml | 2 + |
18 |
x11-wm/xpra/xpra-4.2.ebuild | 170 ++++++++++++++++++++++++++ |
19 |
4 files changed, 185 insertions(+) |
20 |
|
21 |
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest |
22 |
index 9e57431ebb4..58025dff631 100644 |
23 |
--- a/x11-wm/xpra/Manifest |
24 |
+++ b/x11-wm/xpra/Manifest |
25 |
@@ -1,3 +1,4 @@ |
26 |
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 |
27 |
DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e |
28 |
DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39 |
29 |
+DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 |
30 |
|
31 |
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..b1b2afb4e18 |
34 |
--- /dev/null |
35 |
+++ b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch |
36 |
@@ -0,0 +1,12 @@ |
37 |
+diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py |
38 |
+--- a/xpra/scripts/config.py 2021-05-19 16:18:30.475153200 +0100 |
39 |
++++ b/xpra/scripts/config.py 2021-05-30 08:50:42.326953006 +0100 |
40 |
+@@ -159,7 +159,7 @@ |
41 |
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0: |
42 |
+ if (xorg_stat.st_mode & stat.S_IROTH)==0: |
43 |
+ if warn_fn: |
44 |
+- warn_fn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) |
45 |
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) |
46 |
+ return get_Xvfb_command() |
47 |
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin) |
48 |
+ use_wrapper = True |
49 |
|
50 |
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml |
51 |
index ce472786e3a..a90f8afcffa 100644 |
52 |
--- a/x11-wm/xpra/metadata.xml |
53 |
+++ b/x11-wm/xpra/metadata.xml |
54 |
@@ -25,7 +25,9 @@ |
55 |
<flag name="client">Build client-side code</flag> |
56 |
<flag name="clipboard">Enable clipboard support</flag> |
57 |
<flag name="csc">Enable csc softscaler support</flag> |
58 |
+ <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
59 |
<flag name="pillow">Enable pillow support</flag> |
60 |
+ <flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag> |
61 |
<flag name="server">Build server-side code</flag> |
62 |
<flag name="vpx">Enable vpx image format support</flag> |
63 |
<flag name="webcam">Enable webcam support via opencv</flag> |
64 |
|
65 |
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild |
66 |
new file mode 100644 |
67 |
index 00000000000..1f8dc0a75fa |
68 |
--- /dev/null |
69 |
+++ b/x11-wm/xpra/xpra-4.2.ebuild |
70 |
@@ -0,0 +1,170 @@ |
71 |
+# Copyright 1999-2021 Gentoo Authors |
72 |
+# Distributed under the terms of the GNU General Public License v2 |
73 |
+ |
74 |
+EAPI=7 |
75 |
+ |
76 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
77 |
+DISTUTILS_SINGLE_IMPL=yes |
78 |
+DISTUTILS_USE_SETUPTOOLS=no |
79 |
+inherit xdg distutils-r1 tmpfiles prefix udev |
80 |
+ |
81 |
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" |
82 |
+HOMEPAGE="https://xpra.org/" |
83 |
+SRC_URI="https://xpra.org/src/${P}.tar.gz" |
84 |
+ |
85 |
+LICENSE="GPL-2 BSD" |
86 |
+SLOT="0" |
87 |
+KEYWORDS="~amd64 ~x86" |
88 |
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp" |
89 |
+ |
90 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
91 |
+ || ( client server ) |
92 |
+ cups? ( dbus ) |
93 |
+ opengl? ( client ) |
94 |
+" |
95 |
+ |
96 |
+DEPEND=" |
97 |
+ ${PYTHON_DEPS} |
98 |
+ $(python_gen_cond_dep ' |
99 |
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo] |
100 |
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) |
101 |
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
102 |
+ ') |
103 |
+ x11-libs/gtk+:3[introspection] |
104 |
+ x11-libs/libX11 |
105 |
+ x11-libs/libXcomposite |
106 |
+ x11-libs/libXdamage |
107 |
+ x11-libs/libXfixes |
108 |
+ x11-libs/libXrandr |
109 |
+ x11-libs/libXtst |
110 |
+ x11-libs/libxkbfile |
111 |
+ brotli? ( app-arch/brotli ) |
112 |
+ csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
113 |
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
114 |
+ jpeg? ( media-libs/libjpeg-turbo ) |
115 |
+ pulseaudio? ( |
116 |
+ media-sound/pulseaudio |
117 |
+ media-plugins/gst-plugins-pulse:1.0 |
118 |
+ ) |
119 |
+ sound? ( |
120 |
+ media-libs/gstreamer:1.0 |
121 |
+ media-libs/gst-plugins-base:1.0 |
122 |
+ ) |
123 |
+ vpx? ( media-libs/libvpx media-video/ffmpeg ) |
124 |
+ webp? ( media-libs/libwebp ) |
125 |
+" |
126 |
+RDEPEND=" |
127 |
+ ${DEPEND} |
128 |
+ $(python_gen_cond_dep ' |
129 |
+ dev-python/netifaces[${PYTHON_USEDEP}] |
130 |
+ dev-python/rencode[${PYTHON_USEDEP}] |
131 |
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}] |
132 |
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) |
133 |
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
134 |
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) |
135 |
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) |
136 |
+ opengl? ( |
137 |
+ client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) |
138 |
+ ) |
139 |
+ webcam? ( |
140 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
141 |
+ dev-python/pyinotify[${PYTHON_USEDEP}] |
142 |
+ media-libs/opencv[${PYTHON_USEDEP},python] |
143 |
+ ) |
144 |
+ ') |
145 |
+ acct-group/xpra |
146 |
+ virtual/ssh |
147 |
+ x11-apps/xmodmap |
148 |
+ ibus? ( app-i18n/ibus ) |
149 |
+ pinentry? ( app-crypt/pinentry ) |
150 |
+ server? ( |
151 |
+ x11-base/xorg-server[-minimal,xvfb] |
152 |
+ x11-drivers/xf86-input-void |
153 |
+ ) |
154 |
+" |
155 |
+BDEPEND=" |
156 |
+ virtual/pkgconfig |
157 |
+ $(python_gen_cond_dep ' |
158 |
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}] |
159 |
+ ') |
160 |
+ doc? ( app-text/pandoc ) |
161 |
+" |
162 |
+ |
163 |
+RESTRICT="!test? ( test )" |
164 |
+ |
165 |
+PATCHES=( |
166 |
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
167 |
+ "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch |
168 |
+ "${FILESDIR}"/${PN}-4.2-suid-warning.patch |
169 |
+) |
170 |
+ |
171 |
+pkg_postinst() { |
172 |
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf |
173 |
+ |
174 |
+ xdg_pkg_postinst |
175 |
+} |
176 |
+ |
177 |
+python_prepare_all() { |
178 |
+ hprefixify -w '/os.path/' setup.py |
179 |
+ hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ |
180 |
+ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py |
181 |
+ |
182 |
+ sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ |
183 |
+ -i setup.py || die |
184 |
+ |
185 |
+ if use minimal; then |
186 |
+ sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ |
187 |
+ -i setup.py || die |
188 |
+ fi |
189 |
+ |
190 |
+ distutils-r1_python_prepare_all |
191 |
+} |
192 |
+ |
193 |
+python_configure_all() { |
194 |
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ |
195 |
+ -i setup.py || die |
196 |
+ |
197 |
+ mydistutilsargs=( |
198 |
+ --without-PIC |
199 |
+ --without-Xdummy |
200 |
+ $(use_with client) |
201 |
+ $(use_with clipboard) |
202 |
+ $(use_with csc csc_swscale) |
203 |
+ --without-csc_libyuv |
204 |
+ --without-cuda_rebuild |
205 |
+ --without-cuda_kernels |
206 |
+ $(use_with cups printing) |
207 |
+ --without-debug |
208 |
+ $(use_with dbus) |
209 |
+ $(use_with doc docs) |
210 |
+ $(use_with ffmpeg dec_avcodec2) |
211 |
+ $(use_with ffmpeg enc_ffmpeg) |
212 |
+ $(use_with ffmpeg enc_x264) |
213 |
+ $(use_with ffmpeg enc_x265) |
214 |
+ --with-gtk3 |
215 |
+ $(use_with jpeg jpeg_encoder) |
216 |
+ $(use_with jpeg jpeg_decoder) |
217 |
+ --without-mdns |
218 |
+ $(use_with opengl) |
219 |
+ $(use_with server shadow) |
220 |
+ $(use_with server) |
221 |
+ $(use_with sound) |
222 |
+ --with-strict |
223 |
+ $(use_with vpx) |
224 |
+ --with-warn |
225 |
+ $(use_with webcam) |
226 |
+ $(use_with webp) |
227 |
+ --with-x11 |
228 |
+ ) |
229 |
+ |
230 |
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" |
231 |
+} |
232 |
+ |
233 |
+python_install_all() { |
234 |
+ distutils-r1_python_prepare_all |
235 |
+ |
236 |
+ # Move udev dir to the right place. |
237 |
+ local dir=$(get_udevdir) |
238 |
+ dodir "${dir%/*}" |
239 |
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
240 |
+} |