From 513b2cdc8727eadd882b06535f26f54edd61db98 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 12 Jul 2024 11:12:31 -0400 Subject: [PATCH] xpra: update to 6.0.2. --- srcpkgs/xpra/files/README.voidlinux | 33 +++++++++++++++++++++++++++++ srcpkgs/xpra/patches/setup.patch | 18 ++++++++-------- srcpkgs/xpra/template | 30 +++++++++++--------------- 3 files changed, 54 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/xpra/files/README.voidlinux diff --git a/srcpkgs/xpra/files/README.voidlinux b/srcpkgs/xpra/files/README.voidlinux new file mode 100644 index 00000000000..8c74fa0e8d5 --- /dev/null +++ b/srcpkgs/xpra/files/README.voidlinux @@ -0,0 +1,33 @@ +Xpra recommends a number of optional dependencies that may be useful for users. + +For GUI support: +- python3-PyOpenGL +- python3-PyOpenGL-accelerate + +For network features: +- python3-paramiko +- python3-openssl +- python3-cryptography +- python3-uvloop +- python3-socks +- python3-pysocks +- python3-netifaces +- python3-dnspython +- avahi-python3 +- python3-zeroconf + +For printing and other client conveniences: +- python3-cups +- python3-psutil +- python3-inotify +- python3-py-cpuinfo +- python3-setproctitle +- python3-xdg + +For use by some codecs: +- python3-numpy + +For authentication: +- python3-ldap3 +- python3-ldap +- python3-oauthlib diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch index 9870936cabf..77c2b9ed172 100644 --- a/srcpkgs/xpra/patches/setup.patch +++ b/srcpkgs/xpra/patches/setup.patch @@ -2,17 +2,17 @@ Make sure the build script pulls the right CFLAGS and prevent -Werror. --- a/setup.py +++ b/setup.py -@@ -750,7 +750,7 @@ - #we have to add the python cflags: - if not (is_Fedora() or is_Debian() or is_CentOS() or is_RedHat() or is_AlmaLinux() or is_RockyLinux() or is_OracleLinux() or is_openSUSE()): +@@ -945,7 +945,7 @@ + if not (is_Fedora() or is_Debian() or is_CentOS() or is_RedHat() or is_AlmaLinux() or is_RockyLinux() or is_OracleLinux() or is_openSUSE()): # noqa: E501 + # pylint: disable=import-outside-toplevel import sysconfig - for cflag in shlex.split(sysconfig.get_config_var('CFLAGS') or ''): + for cflag in shlex.split(sysconfig.get_config_var('BUILD_CFLAGS') or ''): add_to_keywords(kw, 'extra_compile_args', cflag) - def add_tokens(s, add_to="extra_link_args"): -@@ -809,7 +809,7 @@ - #as of Cython 0.26 + clang 4.0. Other version combinations may require + if OSX: +@@ -1011,7 +1011,7 @@ + # as of Cython 0.26 + clang 4.0. Other version combinations may require #(un)commenting other switches. if not hascflag("-Wno-error"): - addcflags("-Werror") @@ -20,12 +20,12 @@ Make sure the build script pulls the right CFLAGS and prevent -Werror. addcflags( "-Wno-deprecated-register", "-Wno-unused-command-line-argument", -@@ -823,7 +823,7 @@ - ) +@@ -1025,7 +1025,7 @@ + ) else: if not hascflag("-Wno-error"): - addcflags("-Werror") + addcflags("-Wno-error") if NETBSD: - #see: http://trac.cython.org/ticket/395 + # see: http://trac.cython.org/ticket/395 addcflags("-fno-strict-aliasing") diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index a5bd87040d0..e4d9986d6b9 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,25 +1,26 @@ # Template file for 'xpra' pkgname=xpra -version=6.0.1 +version=6.0.2 revision=1 build_style=python3-module -make_build_args="--without-cuda_kernels --without-cuda_rebuild" -make_install_args="$(vopt_with docs) ${make_build_args}" -hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)" +make_build_args="--without-cuda_kernels --without-cuda_rebuild + $(vopt_if docs "--with-docs")" +make_install_args="${make_build_args}" +hostmakedepends="pkg-config python3-setuptools python3-Cython + $(vopt_if docs pandoc)" makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel gtk+3-devel pam-devel libXres-devel liblz4-devel libavif-devel procps-ng-devel xxHash-devel" -depends="cups python3-gobject python3-Pillow python3-cups python3-dbus - python3-lz4 python3-paramiko python3-rencode xauth xf86-video-dummy - xorg-server-xvfb python3-typing_extensions python3-cairo" -short_desc="Persistent remote display server and client for X11 clients" +depends="python3-gobject python3-Pillow python3-lz4 xauth xf86-video-dummy + xorg-server-xvfb" +short_desc="Persistent remote display server and client for X11" maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=2ce121e51ef72a79f0d0a2933ece6e2159da0f3ed1d3e280fb0ce10525c5c7b3 +checksum=bd791c8f1315ee5a7bfc9e12e0520f0522ca43b0e59e3b9bd0664565ca75af65 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" # Tests don't run properly without package installed make_check=no @@ -33,15 +34,6 @@ case "$XBPS_MACHINE" in x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;; esac -if [ -z "$CROSS_BUILD" ]; then - depends+=" python3-PyOpenGL-accelerate" - case "$XBPS_TARGET_MACHINE" in - ppc64*) depends+=" libopencv-python3";; - ppc*) ;; - *) depends+=" libopencv-python3";; - esac -fi - post_install() { vsed -e "s:${DESTDIR/\/\//\/}::" -i ${DESTDIR}/etc/xpra/conf.d/55_server_x11.conf rm -rf ${DESTDIR}/etc/init.d @@ -51,4 +43,6 @@ post_install() { vmkdir usr/share/dbus-1/system.d mv ${DESTDIR}/etc/dbus-1/system.d/xpra.conf ${DESTDIR}/usr/share/dbus-1/system.d + + vdoc "${FILESDIR}/README.voidlinux" }