From 8b943673a15a337c48c71cecad18d9eb68143d95 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Fri, 2 Aug 2024 21:37:17 -0700 Subject: gnu: xpra: Update to 6.1.0. * gnu/packages/xorg.scm (xpra): Update to 6.1.0. [source](origin): Update patch file name. * gnu/packages/patches/xpra-6.0-install_libs.patch: Delete. * gnu/packages/patches/xpra-6.1-install_libs.patch: New file. * gnu/local.mk: Unregister deleted file and register new file. Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de Signed-off-by: Christopher Baines --- gnu/local.mk | 2 +- gnu/packages/patches/xpra-6.0-install_libs.patch | 42 ------------------------ gnu/packages/patches/xpra-6.1-install_libs.patch | 42 ++++++++++++++++++++++++ gnu/packages/xorg.scm | 6 ++-- 4 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/xpra-6.0-install_libs.patch create mode 100644 gnu/packages/patches/xpra-6.1-install_libs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a86bfddc86..8bec41ae5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2267,7 +2267,7 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ %D%/packages/patches/xpra-6.0-systemd-run.patch \ - %D%/packages/patches/xpra-6.0-install_libs.patch \ + %D%/packages/patches/xpra-6.1-install_libs.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/patches/xpra-6.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch deleted file mode 100644 index c608b519f4..0000000000 --- a/gnu/packages/patches/xpra-6.0-install_libs.patch +++ /dev/null @@ -1,42 +0,0 @@ -Distribution specific patch, not going upstream - -This workaround for Gentoo interferes with our use of --no-compile during -the 'install stage. - -diff --git a/setup.py b/setup.py -index 4f066fa8bf..14a9ed65ed 100755 ---- a/setup.py -+++ b/setup.py -@@ -760,8 +760,6 @@ if modules_ENABLED: - # Utility methods for building with Cython - - def do_add_cython_ext(*args, **kwargs): -- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): -- return - if not cython_ENABLED: - raise ValueError(f"cannot build {args}: cython compilation is disabled") - if cython_tracing_ENABLED: -@@ -1971,9 +1969,6 @@ else: - if root_prefix.endswith("/usr"): - # ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" - root_prefix = root_prefix[:-4] -- for x in sys.argv: -- if x.startswith("--root="): -- root_prefix = x[len("--root="):] - print(f" root_prefix={root_prefix!r}") - build_xpra_conf(root_prefix) - -@@ -2116,13 +2111,6 @@ else: - if uinput_ENABLED: - add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) - -- # gentoo does weird things, calls --no-compile with build *and* install -- # then expects to find the cython modules!? ie: -- #> python2.7 setup.py build -b build-2.7 install --no-compile \ -- # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 -- # otherwise we use the flags to skip pkgconfig -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 -- pkgconfig = no_pkgconfig - - if OSX and "py2app" in sys.argv: - import py2app #@UnresolvedImport diff --git a/gnu/packages/patches/xpra-6.1-install_libs.patch b/gnu/packages/patches/xpra-6.1-install_libs.patch new file mode 100644 index 0000000000..0ec2aee288 --- /dev/null +++ b/gnu/packages/patches/xpra-6.1-install_libs.patch @@ -0,0 +1,42 @@ +Distribution specific patch, not going upstream + +This workaround for Gentoo interferes with our use of --no-compile during +the 'install stage. + +diff --git a/setup.py b/setup.py +index be7a3758e8..28dc1be191 100755 +--- a/setup.py ++++ b/setup.py +@@ -953,8 +953,6 @@ if modules_ENABLED: + # Utility methods for building with Cython + + def do_add_cython_ext(*args, **kwargs) -> None: +- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): +- return + if not cython_ENABLED: + raise ValueError(f"cannot build {args}: cython compilation is disabled") + if cython_tracing_ENABLED: +@@ -2175,9 +2173,6 @@ else: + if root_prefix.endswith("/usr"): + # ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" + root_prefix = root_prefix[:-4] +- for x in sys.argv: +- if x.startswith("--root="): +- root_prefix = x[len("--root="):] + print(f" root_prefix={root_prefix!r}") + build_xpra_conf(root_prefix) + +@@ -2320,13 +2315,6 @@ else: + if uinput_ENABLED: + add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) + +- # gentoo does weird things, calls --no-compile with build *and* install +- # then expects to find the cython modules!? ie: +- #> python2.7 setup.py build -b build-2.7 install --no-compile \ +- # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 +- # otherwise we use the flags to skip pkgconfig +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 +- pkgconfig = no_pkgconfig + + if OSX and "py2app" in sys.argv: + import py2app #@UnresolvedImport diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6b953ef152..6825474a6a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6158,7 +6158,7 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "6.0.2") + (version "6.1.0") (source (origin (method git-fetch) @@ -6167,9 +6167,9 @@ (define-public xpra (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "176qxrksgr07jhrlny3zxybnvf091kxkfmfnv9ci3h2k1nbwqh2x")) + (base32 "1x1ld2p3q47irqq6p1b3rd9ffbi7kvgxyvfmgi0skfin17b2aqx4")) (patches (search-patches "xpra-6.0-systemd-run.patch" - "xpra-6.0-install_libs.patch")))) + "xpra-6.1-install_libs.patch")))) (build-system python-build-system) (inputs (list bash-minimal ; for wrap-program -- cgit v1.2.3