This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 4d498935b8 gnu: xpra: Update to 6.5.
4d498935b8 is described below
commit 4d498935b8b6483fc5211b60b050013ee7820944
Author: Andy Tai <[email protected]>
AuthorDate: Fri Jun 19 23:06:41 2026 -0700
gnu: xpra: Update to 6.5.
* gnu/packages/xorg.scm: (xpra): Update to 6.5.
[source](origin): Update patch file names.
* gnu/packages/patches/xpra-6.4-systemd-run.patch: Delete
* gnu/packages/patches/xpra-6.5-systemd-run.patch: New file.
* gnu/local.mk: Unregister deleted files and register new file.
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/local.mk | 2 +-
gnu/packages/patches/xpra-6.4-systemd-run.patch | 45 ----------------------
gnu/packages/patches/xpra-6.5-systemd-run.patch | 50 +++++++++++++++++++++++++
gnu/packages/xorg.scm | 6 +--
4 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0f920bdc49..fc69c79a84 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2655,7 +2655,7 @@ dist_patch_DATA =
\
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch
\
%D%/packages/patches/xpra-5.0-install_libs.patch \
%D%/packages/patches/xpra-5.0-systemd-run.patch \
- %D%/packages/patches/xpra-6.4-systemd-run.patch \
+ %D%/packages/patches/xpra-6.5-systemd-run.patch \
%D%/packages/patches/xpra-6.4-install_libs.patch \
%D%/packages/patches/xterm-370-explicit-xcursor.patch \
%D%/packages/patches/xygrib-fix-finding-data.patch \
diff --git a/gnu/packages/patches/xpra-6.4-systemd-run.patch
b/gnu/packages/patches/xpra-6.4-systemd-run.patch
deleted file mode 100644
index 8ca71e7665..0000000000
--- a/gnu/packages/patches/xpra-6.4-systemd-run.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Distriction specific patch, not going upstream
-
-Disable systemd-run if the command is not found.
-
-diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
-index 734e488eb9..36410d2d85 100755
---- a/xpra/scripts/main.py
-+++ b/xpra/scripts/main.py
-@@ -437,20 +437,26 @@ def use_systemd_run(s) -> bool:
- cmd = ["systemd-run", "--quiet"]
- if getuid() != 0:
- cmd += ["--user"]
-- cmd += ["--scope", "--", "true"]
-- proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
-- proc.communicate(timeout=2)
-- r = proc.returncode
-- except TimeoutExpired: # pragma: no cover
-- r = None
-- if r is None:
-- noerr(proc.terminate)
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
-- proc.communicate(timeout=1)
-+ proc.communicate(timeout=2)
-+ r = proc.returncode
- except TimeoutExpired: # pragma: no cover
- r = None
-- return r == 0
-+ if r is None:
-+ try:
-+ proc.terminate()
-+ except Exception:
-+ pass
-+ try:
-+ proc.communicate(timeout=1)
-+ except TimeoutExpired: # pragma: no cover
-+ r = None
-+ return r==0
-+ except FileNotFoundError:
-+ return False
-
-
- def verify_gir() -> None:
diff --git a/gnu/packages/patches/xpra-6.5-systemd-run.patch
b/gnu/packages/patches/xpra-6.5-systemd-run.patch
new file mode 100644
index 0000000000..05f209d6eb
--- /dev/null
+++ b/gnu/packages/patches/xpra-6.5-systemd-run.patch
@@ -0,0 +1,50 @@
+Distribution specific patch, not going upstream
+
+Disable systemd-run if the command is not found.
+
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index f3aaf7547b..0218de8a98 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -470,24 +470,24 @@ def use_systemd_run(s) -> bool:
+ if not is_systemd_pid1():
+ return False # pragma: no cover
+ # test it:
+- cmd = ["systemd-run", "--quiet"]
+- if getuid() != 0:
+- cmd += ["--user"]
+- cmd += ["--scope", "--", "true"]
+- proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
+ try:
+- proc.communicate(timeout=2)
+- r = proc.returncode
+- except TimeoutExpired: # pragma: no cover
+- r = None
+- if r is None:
+- stop_proc(proc, "systemd-run")
+- if proc.poll() is None:
+- try:
+- proc.communicate(timeout=1)
+- except TimeoutExpired: # pragma: no cover
+- r = None
+- return r == 0
++ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
++ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
++ try:
++ proc.communicate(timeout=2)
++ r = proc.returncode
++ except TimeoutExpired: # pragma: no cover
++ r = None
++ if r is None:
++ stop_proc(proc, "systemd-run")
++ if proc.poll() is None:
++ try:
++ proc.communicate(timeout=1)
++ except TimeoutExpired: # pragma: no cover
++ r = None
++ return r == 0
++ except FileNotFoundError:
++ return False
+
+
+ def verify_gir() -> None:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e17bc111cc..c39be479f7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6536,7 +6536,7 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
- (version "6.4.4")
+ (version "6.5")
(source
(origin
(method git-fetch)
@@ -6545,8 +6545,8 @@ basic eye-candy effects.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0zbr3vghn4qhng1kgxyncc2bizc9cjbkhyf8gvn3i29g9g33lcnc"))
- (patches (search-patches "xpra-6.4-systemd-run.patch"
+ (base32 "05nww5ay9hj6340p9smicmggwa2m9bmrinmnqxjaqr64xni1pisd"))
+ (patches (search-patches "xpra-6.5-systemd-run.patch"
"xpra-6.4-install_libs.patch"))))
(build-system pyproject-build-system)
(inputs
