x11-wm/xpra: Drop old 4.2.2

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
2022-01-15 23:29:04 +00:00
parent e58c93a656
commit 0e863ca57c
4 changed files with 0 additions and 263 deletions

View File

@@ -1,4 +1,3 @@
DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c

View File

@@ -1,40 +0,0 @@
diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
index 1ceaf4573..870801666 100755
--- a/tests/unittests/unit/net/net_util_test.py
+++ b/tests/unittests/unit/net/net_util_test.py
@@ -6,6 +6,7 @@
import unittest
+from collections import defaultdict
from xpra.net.net_util import (
get_info, get_interfaces, get_interfaces_addresses, #get_interface,
get_gateways, get_bind_IPs, do_get_bind_ifacemask,
@@ -26,10 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
ifaces = get_interfaces()
if not ifaces:
return
+ ip_ifaces = defaultdict(list)
for iface in ifaces:
- ipmasks = do_get_bind_ifacemask(iface)
- for ip, _ in ipmasks:
- assert get_iface(ip)==iface
if if_nametoindex:
try:
i = if_nametoindex(iface)
@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
pass
else:
if if_indextoname:
- assert if_indextoname(i)==iface
+ assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
+ iface, i, if_indextoname(i))
+ ipmasks = do_get_bind_ifacemask(iface)
+ for ip, _ in ipmasks:
+ ip_ifaces[ip].append(iface)
+ for ip, ifaces in ip_ifaces.items():
+ assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
+ ip, ifaces, get_iface(ip))
ia = get_interfaces_addresses()
assert ia
#for iface, address in ia.items():

View File

@@ -1,22 +0,0 @@
From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
From: totaam <antoine@xpra.org>
Date: Sun, 22 Aug 2021 21:31:52 +0700
Subject: [PATCH] #3239 with shell=True, best not to use a list
---
xpra/os_util.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xpra/os_util.py b/xpra/os_util.py
index 2f8c0d64a..2f309f888 100644
--- a/xpra/os_util.py
+++ b/xpra/os_util.py
@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
ldconfig = t
break
import subprocess
- p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ p = subprocess.Popen("%s -p" % ldconfig, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
data = bytestostr(p.communicate()[0])
libpath = re.search(pattern, data, re.MULTILINE) #@UndefinedVariable

View File

@@ -1,200 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_USE_SETUPTOOLS=no
inherit xdg xdg-utils distutils-r1 tmpfiles udev
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="https://xpra.org/"
SRC_URI="https://xpra.org/src/${P}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
cups? ( dbus )
opengl? ( client )
test? ( client clipboard dbus html server sound xdg xinerama )
"
TDEPEND="
$(python_gen_cond_dep '
dev-python/netifaces[${PYTHON_USEDEP}]
dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
')
html? ( www-apps/xpra-html5 )
server? (
x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
)
xinerama? ( x11-libs/libfakeXinerama )
"
DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
')
x11-libs/gtk+:3[introspection]
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
x11-libs/libxkbfile
brotli? ( app-arch/brotli )
csc? ( >=media-video/ffmpeg-1.2.2:0= )
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
jpeg? ( media-libs/libjpeg-turbo )
pulseaudio? (
media-sound/pulseaudio
media-plugins/gst-plugins-pulse:1.0
)
sound? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )
"
RDEPEND="
${DEPEND}
${TDEPEND}
$(python_gen_cond_dep '
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
opengl? (
client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
)
webcam? (
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pyinotify[${PYTHON_USEDEP}]
media-libs/opencv[${PYTHON_USEDEP},python]
)
')
acct-group/xpra
virtual/ssh
x11-apps/xauth
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
"
DEPEND+="
test? ( ${TDEPEND} )
"
BDEPEND="
$(python_gen_cond_dep '
>=dev-python/cython-0.16[${PYTHON_USEDEP}]
')
virtual/pkgconfig
doc? ( app-text/pandoc )
"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-4.2.2-ldconfig.patch
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
"${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
"${FILESDIR}"/${PN}-4.2.2-dup-ip.patch
"${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
)
python_prepare_all() {
distutils-r1_python_prepare_all
# FIXME: There are hardcoded paths all over the place but the following
# double-prefixes some files under /etc. Looks tricky to fix. :(
#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
-i setup.py || die
if use minimal; then
sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
-i setup.py || die
fi
# Upstream says these tests are currently broken.
rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
}
python_configure_all() {
sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-i setup.py || die
mydistutilsargs=(
--without-PIC
--without-Xdummy
$(use_with client)
$(use_with clipboard)
$(use_with csc csc_swscale)
--without-csc_libyuv
--without-cuda_rebuild
--without-cuda_kernels
$(use_with cups printing)
--without-debug
$(use_with dbus)
$(use_with doc docs)
$(use_with ffmpeg dec_avcodec2)
$(use_with ffmpeg enc_ffmpeg)
$(use_with ffmpeg enc_x264)
$(use_with ffmpeg enc_x265)
--with-gtk3
$(use_with jpeg jpeg_encoder)
$(use_with jpeg jpeg_decoder)
--without-mdns
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
$(use_with sound)
--with-strict
$(use_with vpx)
--with-warn
$(use_with webcam)
$(use_with webp)
--with-x11
)
export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
}
python_test() {
export XAUTHORITY=${HOME}/.Xauthority
touch "${XAUTHORITY}" || die
distutils_install_for_testing
xdg_environment_reset
PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
"${PYTHON}" tests/unittests/unit/run.py || die
}
python_install_all() {
distutils-r1_python_prepare_all
# Move udev dir to the right place.
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
}
pkg_postinst() {
tmpfiles_process xpra.conf
xdg_pkg_postinst
}