Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
Date: Wed, 07 Apr 2021 23:05:13
Message-Id: 1617836687.6514301e0a2ddc6a629c1f41a0e6c7bb8f1faa87.chewi@gentoo
1 commit: 6514301e0a2ddc6a629c1f41a0e6c7bb8f1faa87
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 7 23:04:47 2021 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 7 23:04:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6514301e
7
8 x11-wm/xpra: Drop old 4.0.6-r28363
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 x11-wm/xpra/Manifest | 1 -
14 x11-wm/xpra/files/xpra-4.0.6-r28363.patch | 238 ------------------------------
15 x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 160 --------------------
16 3 files changed, 399 deletions(-)
17
18 diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
19 index 0103f4ad8be..32cb2c66399 100644
20 --- a/x11-wm/xpra/Manifest
21 +++ b/x11-wm/xpra/Manifest
22 @@ -1,4 +1,3 @@
23 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
24 -DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
25 DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89 SHA512 b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
26 DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
27
28 diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
29 deleted file mode 100644
30 index 5187b700c0d..00000000000
31 --- a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
32 +++ /dev/null
33 @@ -1,238 +0,0 @@
34 -Index: selinux/xpra_socketactivation/xpra_socketactivation.te
35 -===================================================================
36 ---- a/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28285)
37 -+++ b/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28363)
38 -@@ -27,6 +27,7 @@
39 - type unconfined_t;
40 - type bin_t;
41 - type avahi_t;
42 -+ type config_home_t;
43 -
44 - attribute can_read_shadow_passwords;
45 - }
46 -@@ -55,6 +56,9 @@
47 - allow xpra_t xpra_conf_t:dir { getattr open read search };
48 - files_search_etc(xpra_t)
49 -
50 -+allow xpra_t config_home_t:dir { getattr search };
51 -+allow xpra_t config_home_t:file { getattr ioctl open read };
52 -+
53 - type xpra_socket_t;
54 - files_type(xpra_socket_t)
55 -
56 -Index: setup.py
57 -===================================================================
58 ---- a/setup.py (revision 28285)
59 -+++ b/setup.py (revision 28363)
60 -@@ -1533,8 +1533,9 @@
61 - for k,v in subs.items():
62 - data = data.replace(k, v)
63 - with open(dst_file, "wb") as f:
64 -- return f.write(data)
65 -+ f.write(data)
66 - if chmod:
67 -+ print("chmod(%s, %s)" % (dst_file, oct(chmod)))
68 - os.chmod(dst_file, chmod)
69 -
70 - if printing_ENABLED and POSIX:
71 -Index: unittests/unit/net/crypto_test.py
72 -===================================================================
73 ---- a/unittests/unit/net/crypto_test.py (revision 28285)
74 -+++ b/unittests/unit/net/crypto_test.py (revision 28363)
75 -@@ -88,7 +88,7 @@
76 - start = monotonic_time()
77 - self.do_test_backend(data, enc_iterations, dec_iterations)
78 - end = monotonic_time()
79 -- elapsed = end-start
80 -+ elapsed = max(0.0001, end-start)
81 - speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
82 - iter_time = elapsed*1000/(enc_iterations + dec_iterations)
83 - print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
84 -Index: win32/MINGW_BUILD.sh
85 -===================================================================
86 ---- a/win32/MINGW_BUILD.sh (revision 28285)
87 -+++ b/win32/MINGW_BUILD.sh (revision 28363)
88 -@@ -286,6 +286,8 @@
89 - #why is it shipping those files??
90 - find lib/ -name "*dll.a" -exec rm {} \;
91 - #only keep the actual loaders, not all the other crap cx_Freeze put there:
92 -+#but keep librsvg
93 -+mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
94 - mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
95 - mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
96 - rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
97 -@@ -326,6 +328,9 @@
98 - #and keep pdfium:
99 - mv lib/*pdfium*.dll ./
100 - pushd lib > /dev/null
101 -+#cx_Freeze forgets these two!?
102 -+cp $MINGW_PREFIX/bin/libatk-*dll ./
103 -+cp $MINGW_PREFIX/bin/libgtk-*dll ./
104 - #remove all the pointless duplication:
105 - for x in `ls *dll`; do
106 - find ./ -mindepth 2 -name "${x}" -exec rm {} \;
107 -Index: xpra/client/gtk_base/gtk_client_window_base.py
108 -===================================================================
109 ---- a/xpra/client/gtk_base/gtk_client_window_base.py (revision 28285)
110 -+++ b/xpra/client/gtk_base/gtk_client_window_base.py (revision 28363)
111 -@@ -1806,10 +1806,16 @@
112 -
113 - def _set_backing_size(self, ww, wh):
114 - b = self._backing
115 -+ bw = self._client.cx(ww)
116 -+ bh = self._client.cy(wh)
117 -+ if max(ww, wh)>=32000 or min(ww, wh)<0:
118 -+ raise Exception("invalid window size %ix%i" % (ww, wh))
119 -+ if max(bw, bh)>=32000:
120 -+ raise Exception("invalid window backing size %ix%i" % (bw, bh))
121 - if b:
122 -- b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
123 -+ b.init(ww, wh, bw, bh)
124 - else:
125 -- self.new_backing(self._client.cx(ww), self._client.cy(wh))
126 -+ self.new_backing(bw, bh)
127 -
128 - def resize(self, w, h, resize_counter=0):
129 - ww, wh = self.get_size()
130 -Index: xpra/net/file_transfer.py
131 -===================================================================
132 ---- a/xpra/net/file_transfer.py (revision 28285)
133 -+++ b/xpra/net/file_transfer.py (revision 28363)
134 -@@ -580,6 +580,10 @@
135 -
136 - def _process_open_url(self, packet):
137 - url, send_id = packet[1:3]
138 -+ try:
139 -+ url = strtobytes(url).decode("utf8")
140 -+ except UnicodeDecodeError:
141 -+ url = bytestostr(url)
142 - if not self.open_url:
143 - filelog.warn("Warning: received a request to open URL '%s'", url)
144 - filelog.warn(" but opening of URLs is disabled")
145 -@@ -670,12 +674,12 @@
146 - filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
147 - def cb_answer(accept):
148 - filelog("accept%s=%s", (url, printit, openit), accept)
149 -+ self.send("send-data-response", send_id, accept)
150 - #filenames and url are always sent encoded as utf8:
151 - try:
152 - url = strtobytes(url).decode("utf8")
153 - except:
154 - url = bytestostr(url)
155 -- self.send("send-data-response", send_id, accept)
156 - if dtype==b"file":
157 - if not self.file_transfer:
158 - cb_answer(False)
159 -Index: xpra/net/socket_util.py
160 -===================================================================
161 ---- a/xpra/net/socket_util.py (revision 28285)
162 -+++ b/xpra/net/socket_util.py (revision 28363)
163 -@@ -622,7 +622,7 @@
164 - log.info(" %s does not exist", dirname)
165 - #only show extra information if the socket permissions
166 - #would have been accessible by the group:
167 -- if POSIX and (sperms & 0o40):
168 -+ elif POSIX and (sperms & 0o40):
169 - uid = getuid()
170 - username = get_username_for_uid(uid)
171 - groups = get_groups(username)
172 -Index: xpra/platform/xposix/paths.py
173 -===================================================================
174 ---- a/xpra/platform/xposix/paths.py (revision 28285)
175 -+++ b/xpra/platform/xposix/paths.py (revision 28363)
176 -@@ -102,12 +102,12 @@
177 -
178 - def do_get_user_conf_dirs(uid):
179 - #per-user configuration location:
180 -- #(but never use /root/.xpra)
181 -+ #(but never use /root/.xpra or /root/.config/xpra)
182 - if uid is None:
183 - uid = os.getuid()
184 - dirs = []
185 -- dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
186 - if uid>0:
187 -+ dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
188 - dirs.append("~/.xpra")
189 - return dirs
190 -
191 -Index: xpra/platform/xposix/sd_listen.pyx
192 -===================================================================
193 ---- a/xpra/platform/xposix/sd_listen.pyx (revision 28285)
194 -+++ b/xpra/platform/xposix/sd_listen.pyx (revision 28363)
195 -@@ -52,7 +52,7 @@
196 - return sockets
197 -
198 - def get_sd_socket_type(fd):
199 -- from xpra.net.common import TCP_SOCKTYPES
200 -+ from xpra.net.bytestreams import TCP_SOCKTYPES
201 - socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
202 - if not socktype:
203 - socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
204 -Index: xpra/server/mixins/audio_server.py
205 -===================================================================
206 ---- a/xpra/server/mixins/audio_server.py (revision 28285)
207 -+++ b/xpra/server/mixins/audio_server.py (revision 28363)
208 -@@ -121,7 +121,7 @@
209 - from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
210 - rd = osexpand(get_runtime_dir())
211 - if not os.path.exists(rd) or not os.path.isdir(rd):
212 -- log.warn("Warning: the runtime directory '%s' does not exist,")
213 -+ log.warn("Warning: the runtime directory '%s' does not exist,", rd)
214 - log.warn(" cannot start a private pulseaudio server")
215 - else:
216 - xpra_rd = _get_xpra_runtime_dir()
217 -Index: xpra/server/window/motion.pyx
218 -===================================================================
219 ---- a/xpra/server/window/motion.pyx (revision 28285)
220 -+++ b/xpra/server/window/motion.pyx (revision 28363)
221 -@@ -79,7 +79,7 @@
222 - for i,v in enumerate(arr):
223 - self.a2[i] = <uint64_t> abs(v)
224 -
225 -- def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
226 -+ def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
227 - """
228 - Add a new image to compare with,
229 - checksum its rows into a2,
230 -Index: xpra/server/window/window_video_source.py
231 -===================================================================
232 ---- a/xpra/server/window/window_video_source.py (revision 28285)
233 -+++ b/xpra/server/window/window_video_source.py (revision 28363)
234 -@@ -1785,6 +1785,13 @@
235 - scrolllog("no scrolling: detection has already been used on this image")
236 - #we've already checked
237 - return False
238 -+ x = image.get_target_x()
239 -+ y = image.get_target_y()
240 -+ w = image.get_width()
241 -+ h = image.get_height()
242 -+ if w>=32000 or h>=32000:
243 -+ scrolllog("no scrolling: the image is too large, %ix%i", w, h)
244 -+ return False
245 - #don't download the pixels if we have a GPU buffer,
246 - #since that means we're likely to be able to compress on the GPU too with NVENC:
247 - if not image.has_pixels():
248 -@@ -1792,10 +1799,6 @@
249 - if self.content_type=="video" or not self.non_video_encodings:
250 - scrolllog("no scrolling: content is video")
251 - return False
252 -- x = image.get_target_x()
253 -- y = image.get_target_y()
254 -- w = image.get_width()
255 -- h = image.get_height()
256 - if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
257 - scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
258 - w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
259 -Index: xpra/x11/x11_server_core.py
260 -===================================================================
261 ---- a/xpra/x11/x11_server_core.py (revision 28285)
262 -+++ b/xpra/x11/x11_server_core.py (revision 28363)
263 -@@ -687,7 +687,7 @@
264 - #we can use XRRSetScreenSize:
265 - try:
266 - with xsync:
267 -- RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
268 -+ RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
269 - except XError:
270 - screenlog("XRRSetScreenSize failed", exc_info=True)
271 - screenlog("calling RandR.get_screen_size()")
272
273 diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
274 deleted file mode 100644
275 index 5a306498e82..00000000000
276 --- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
277 +++ /dev/null
278 @@ -1,160 +0,0 @@
279 -# Copyright 1999-2021 Gentoo Authors
280 -# Distributed under the terms of the GNU General Public License v2
281 -
282 -EAPI=7
283 -
284 -PYTHON_COMPAT=( python3_{7,8,9} )
285 -DISTUTILS_SINGLE_IMPL=yes
286 -DISTUTILS_USE_SETUPTOOLS=no
287 -inherit xdg distutils-r1 tmpfiles prefix
288 -
289 -MY_P="${PN}-${PV%_p*}"
290 -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
291 -HOMEPAGE="https://xpra.org/"
292 -SRC_URI="https://xpra.org/src/${MY_P}.tar.xz"
293 -
294 -LICENSE="GPL-2 BSD"
295 -SLOT="0"
296 -KEYWORDS="~amd64 ~x86"
297 -IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
298 -
299 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
300 - || ( client server )
301 - cups? ( dbus )
302 - opengl? ( client )
303 -"
304 -
305 -DEPEND="
306 - ${PYTHON_DEPS}
307 - $(python_gen_cond_dep '
308 - dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
309 - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
310 - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
311 - ')
312 - x11-libs/gtk+:3[introspection]
313 - x11-libs/libX11
314 - x11-libs/libXcomposite
315 - x11-libs/libXdamage
316 - x11-libs/libXfixes
317 - x11-libs/libXrandr
318 - x11-libs/libXtst
319 - x11-libs/libxkbfile
320 - brotli? ( app-arch/brotli )
321 - csc? ( >=media-video/ffmpeg-1.2.2:0= )
322 - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
323 - jpeg? ( media-libs/libjpeg-turbo )
324 - pulseaudio? (
325 - media-sound/pulseaudio
326 - media-plugins/gst-plugins-pulse:1.0
327 - )
328 - sound? (
329 - media-libs/gstreamer:1.0
330 - media-libs/gst-plugins-base:1.0
331 - )
332 - vpx? ( media-libs/libvpx media-video/ffmpeg )
333 - webp? ( media-libs/libwebp )
334 -"
335 -RDEPEND="
336 - ${DEPEND}
337 - $(python_gen_cond_dep '
338 - dev-python/netifaces[${PYTHON_USEDEP}]
339 - dev-python/rencode[${PYTHON_USEDEP}]
340 - dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
341 - cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
342 - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
343 - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
344 - lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
345 - opengl? (
346 - client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
347 - )
348 - webcam? (
349 - dev-python/numpy[${PYTHON_USEDEP}]
350 - dev-python/pyinotify[${PYTHON_USEDEP}]
351 - media-libs/opencv[${PYTHON_USEDEP},python]
352 - )
353 - ')
354 - acct-group/xpra
355 - virtual/ssh
356 - x11-apps/xmodmap
357 - server? (
358 - x11-base/xorg-server[-minimal,xvfb]
359 - x11-drivers/xf86-input-void
360 - )
361 -"
362 -BDEPEND="
363 - virtual/pkgconfig
364 - $(python_gen_cond_dep '
365 - >=dev-python/cython-0.16[${PYTHON_USEDEP}]
366 - ')
367 -"
368 -
369 -RESTRICT="!test? ( test )"
370 -
371 -PATCHES=(
372 - "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
373 - "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
374 - "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
375 - "${FILESDIR}"/${PN}-4.0.6-r28363.patch
376 -)
377 -
378 -S="${WORKDIR}/${MY_P}"
379 -
380 -pkg_postinst() {
381 - tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
382 -
383 - xdg_pkg_postinst
384 -}
385 -
386 -python_prepare_all() {
387 - hprefixify -w '/os.path/' setup.py
388 - hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
389 - xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
390 -
391 - if use minimal; then
392 - sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
393 - -i setup.py || die
394 - fi
395 -
396 - distutils-r1_python_prepare_all
397 -}
398 -
399 -python_configure_all() {
400 - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
401 - -i setup.py || die
402 -
403 - mydistutilsargs=(
404 - --without-PIC
405 - --without-Xdummy
406 - $(use_with client)
407 - $(use_with clipboard)
408 - $(use_with csc csc_swscale)
409 - --without-csc_libyuv
410 - --without-cuda_rebuild
411 - --without-cuda_kernels
412 - $(use_with cups printing)
413 - --without-debug
414 - $(use_with dbus)
415 - $(use_with ffmpeg dec_avcodec2)
416 - $(use_with ffmpeg enc_ffmpeg)
417 - $(use_with ffmpeg enc_x264)
418 - $(use_with ffmpeg enc_x265)
419 - --with-gtk3
420 - --without-html5
421 - $(use_with jpeg jpeg_encoder)
422 - $(use_with jpeg jpeg_decoder)
423 - --without-mdns
424 - --without-minify
425 - $(use_with opengl)
426 - $(use_with server shadow)
427 - $(use_with server)
428 - $(use_with sound)
429 - --with-strict
430 - $(use_with vpx)
431 - --with-warn
432 - $(use_with webcam)
433 - $(use_with webp)
434 - --with-x11
435 - )
436 -
437 - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
438 -}