commit: f4faeb20b18dda9a216e0f582c7e8ba668bfde1f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 07:50:47 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon May 1 07:50:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4faeb20
x11-wm/xpra: Drop old 4.3.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 -
x11-wm/xpra/files/xpra-4.2-suid-warning.patch | 12 --
x11-wm/xpra/files/xpra-4.3-cpp.patch | 34 ----
x11-wm/xpra/xpra-4.3.3.ebuild | 216 --------------------------
4 files changed, 263 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 1b68b101e872..92b946c95af1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,2 @@
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
SHA512
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B
2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23
SHA512
c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
SHA512
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
deleted file mode 100644
index b1b2afb4e18b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py 2021-05-19 16:18:30.475153200 +0100
-+++ b/xpra/scripts/config.py 2021-05-30 08:50:42.326953006 +0100
-@@ -159,7 +159,7 @@
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
- if warn_fn:
-- warn_fn("%s is suid and not readable, Xdummy support
unavailable" % xorg_bin)
-+ debug("%s is suid and not readable, Xdummy support
unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy
wrapper" % xorg_bin)
- use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch
b/x11-wm/xpra/files/xpra-4.3-cpp.patch
deleted file mode 100644
index 41f1263e3465..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-cpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <ch...@gentoo.org>
-Date: Sun, 22 May 2022 12:00:01 +0100
-Subject: [PATCH] Most build systems respect the CPP env var instead of just
- calling cpp
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f84d56c6d..7f0db3b69 100755
---- a/setup.py
-+++ b/setup.py
-@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
- print("ARCH=%s" % (ARCH,))
-
- INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix,
"include")).split(os.pathsep)
-+CPP = os.environ.get("CPP", "cpp")
-
- from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
-@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
- ENABLE_DEVICE_CAPS = 0
- if os.path.exists(videodev2_h):
- try:
-- with subprocess.Popen("cpp -fpreprocessed %s | grep -q
device_caps" % videodev2_h,
-+ with subprocess.Popen("%s -fpreprocessed %s | grep -q
device_caps" % (CPP, videodev2_h),
- shell=True) as proc:
- ENABLE_DEVICE_CAPS = proc.wait()==0
- except OSError:
---
-2.35.1
-
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
deleted file mode 100644
index 2bc1844bb041..000000000000
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
- KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/";
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev
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/libXres
- 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 )
- udev? ( virtual/udev )
-"
-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-suid-warning.patch
- "${FILESDIR}"/${PN}-4.3-no-service.patch
- "${FILESDIR}"/${PN}-4.3-cpp.patch
- "${DISTDIR}"/${PN}-4.3.1-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
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True
False):" \
- -i setup.py || die
-
- DISTUTILS_ARGS=(
- --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
-
- env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
- PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
- XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
- "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
-}
-
-python_install_all() {
- distutils-r1_python_prepare_all
-
- # Move udev dir to the right place.
- if use udev; then
- local dir=$(get_udevdir)
- dodir "${dir%/*}"
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
- else
- rm -vr "${ED}"/usr/lib/udev || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process xpra.conf
- xdg_pkg_postinst
- use udev && udev_reload
-}
-
-pkg_postrm() {
- xdg_pkg_postinst
- use udev && udev_reload
-}
