diff options
Diffstat (limited to 'x11-wm/xpra')
-rw-r--r-- | x11-wm/xpra/Manifest | 5 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch | 30 | ||||
-rw-r--r-- | x11-wm/xpra/xpra-4.2.3.ebuild (renamed from x11-wm/xpra/xpra-4.2.1.ebuild) | 64 |
3 files changed, 80 insertions, 19 deletions
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 62c78c62af3a..4f233b88047b 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -5,10 +5,11 @@ AUX xpra-4.2.2-bad-tests.patch 1909 BLAKE2B 35388169dad048ec457a197e922cbe137ab9 AUX xpra-4.2.2-dup-ip.patch 1729 BLAKE2B 389daa60daa788293ea8fb2aff27f83cf4e681d933d3d903bacc288d366525757cdcc78bedc4c6147e6efb3b315c8da9009125cdef84db943bd16a553ed5ca29 SHA512 85a5da4377a1fc6a724040ccaddecfed6d6ea319e6d06325a8b9ac25a9eb1072d8f87971bf62d9814f9a2c6ec38e2e950baca2527d08590e00dc4f09086378b5 AUX xpra-4.2.2-ldconfig.patch 862 BLAKE2B 747f5777f5e4a3b268bbe1a1ce850838011e50eaffce96a55d9888dd8be17d739d49d4582bb5229729631f38bae5783397f0e8bcfa2ffdaacb13a555401fdc46 SHA512 9285f44207da98992524c5445a49f246916e7b774fa3a82ab50265261cccae4378fe0a2d83a414e7376f674b0189259212ab5a48d0291ca08b9f9ed8dcf23546 AUX xpra-4.2.2-true-false-bin-path.patch 1555 BLAKE2B 90882a8071e3a9d7e4d3e1a31a66de70c7b26c069ac848dbbbf3396917797df96e1bb08aabe96007c079fce570e361cc50078ab66cba8445edebf86ce02508e1 SHA512 a1e9498942c7c8fad0740b4aeeed098bb6d2c28a15506c8044c0c7b21ebfe954ffcf2b6be1439357cdef229a047841caa5b1dfcac7fc96b083041fe5f2c997a4 -DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55 +AUX xpra-4.2.3-dup-ip.patch 1486 BLAKE2B 2da134f53c9cf8fefd4df5e6a2edc0c7c6d8cbda4320df09cd3c3b56b3807e418b1efe22c187dc93830c15ea4fe1ddbe4e05bc5293bd4337960df086a37acd93 SHA512 8716f58fcfb423adcc6c34f712a51251717682e38c05724004ebcbcb7d0c1b2fc505d214c75c9a1eb18428205d2117cb2be9003a639b63d19ed95d131c0d86e4 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 -EBUILD xpra-4.2.1.ebuild 4153 BLAKE2B 83fabbba7623d98cd9fc4455f405eebf8d0c8d227f172ecc2e6db62f748a7c0452d37c15aefa61d29fe532afd80fe4a581c9703ba296e374654dcbeae25705b9 SHA512 7c78c3248308d8aff10618eb3dae089dea1206192e919f45a622455276b885a668ccce392cd87f1d124bc75b3a4cbd5584c839048f2112b79df7f463853d4850 EBUILD xpra-4.2.2.ebuild 5116 BLAKE2B c6618758809c932323bbc82ce569d570596273090d1538a3091bfa6847faf465068451186018eaacaf398bf78bd040384d082a0235be76f5fbe843465d697594 SHA512 cca2d6c7de5d527ba4f68663e4fcfbe06f247f12865795c5145cae4ef9c1bf39995ffcd8e88f85de19fdb181098644ec285587ad1cd7903912d7040b122318c8 +EBUILD xpra-4.2.3.ebuild 5083 BLAKE2B 55ea7ae97a9071291189cc3930ecedc5ffe4c8c83c4de3035487fe4128f42f3ddc21781d93cdcc4b59d87a1907ebe17766caf9c9b4465bffe57dd0a5c644a2d6 SHA512 432959ac0e2ce1e430645a02c45cfd55951483cfe7e7139266e508531e9e4ab42fd48feb671b716b0bc7e57bcb722395dbd73dea97dce31b7a02b0fdf1a75d9c EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4 MISC metadata.xml 1362 BLAKE2B aedd143fbf55007c51f421515caa31daa954f6430ae0412ee33796471ac5beb1cec88b0e70f6598ab69640362804d67c75f9e04b2f43bddae5363644bcd0f547 SHA512 1a80da8c0e353a3ef671b3756b12cafa546def2935dca133bf349b8207b64a3f60d4de38b677b7c1ef2de69febe37d75e6950ee4b5873f8b466a75325e3b89d6 diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch new file mode 100644 index 000000000000..337527305ecc --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch @@ -0,0 +1,30 @@ +diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py +index 5c6e3096c..870801666 100755 +--- a/tests/unittests/unit/net/net_util_test.py ++++ b/tests/unittests/unit/net/net_util_test.py +@@ -27,11 +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, "expected interface %s for ip %s but got %s" % ( +- iface, ip, get_iface(ip)) + if if_nametoindex: + try: + i = if_nametoindex(iface) +@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase): + if if_indextoname: + 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(): diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.3.ebuild index 3cf2a6ed02a9..6280862e546a 100644 --- a/x11-wm/xpra/xpra-4.2.1.ebuild +++ b/x11-wm/xpra/xpra-4.2.3.ebuild @@ -6,23 +6,39 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=yes DISTUTILS_USE_SETUPTOOLS=no -inherit xdg distutils-r1 tmpfiles prefix udev +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" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp" +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 ' @@ -55,12 +71,9 @@ DEPEND=" " RDEPEND=" ${DEPEND} + ${TDEPEND} $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) opengl? ( @@ -74,19 +87,19 @@ RDEPEND=" ') acct-group/xpra virtual/ssh + x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) +" +DEPEND+=" + test? ( ${TDEPEND} ) " BDEPEND=" - virtual/pkgconfig $(python_gen_cond_dep ' >=dev-python/cython-0.16[${PYTHON_USEDEP}] ') + virtual/pkgconfig doc? ( app-text/pandoc ) " @@ -94,14 +107,18 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch - "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch "${FILESDIR}"/${PN}-4.2-suid-warning.patch + "${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch + "${FILESDIR}"/${PN}-4.2.3-dup-ip.patch + "${FILESDIR}"/${PN}-4.2.2-bad-tests.patch ) python_prepare_all() { - hprefixify -w '/os.path/' setup.py - hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ - xpra/platform{/xposix,}/paths.py xpra/scripts/server.py + 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 @@ -111,7 +128,8 @@ python_prepare_all() { -i setup.py || die fi - distutils-r1_python_prepare_all + # 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() { @@ -154,6 +172,18 @@ python_configure_all() { 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 |