[PATCH] gnu: xpra: Update to 5.0.1

  • Done
  • quality assurance status badge
Details
3 participants
  • Andy Tai
  • Ludovic Courtès
  • Christopher Baines
Owner
unassigned
Submitted by
Andy Tai
Severity
normal
A
A
A
Andy Tai wrote on 11 Sep 2023 05:50
[PATCH v2] gnu: xpra: Update to 5.0.1
(address . 65849@debbugs.gnu.org)(name . Andy Tai)(address . atai@atai.org)
3311247b0b9368e217e37b7810e0a86f5f32c78c.1694404192.git.atai@atai.org
From 9d1118eab79d4fe7fa20490209780dbd88c9fbb0 Mon Sep 17 00:00:00 2001
Message-Id: <9d1118eab79d4fe7fa20490209780dbd88c9fbb0.1694305735.git.ltai@roku.com>
From: Andy Tai <ltai@roku.com>
Date: Sat, 9 Sep 2023 17:26:39 -0700
Subject: [PATCH] gnu: xpra: Update to 5.0.1
To: guix-patches@gnu.org

* gnu/packages/xorg.scm (xpra): Update to 5.0.1.
[inputs]: Add cups.
* gnu/packages/patches/xpra-5.0-install_libs.patch: New file.
* gnu/packages/patches/xpra-5.0-systemd-run.patch: New file.
* gnu/packages/patches/xpra-4.2-install_libs.patch: Removed.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Removed.
---
...libs.patch => xpra-5.0-install_libs.patch} | 32 ++++++++++++-------
...d-run.patch => xpra-5.0-systemd-run.patch} | 31 +++++++++---------
gnu/packages/xorg.scm | 14 ++++----
3 files changed, 43 insertions(+), 34 deletions(-)
rename gnu/packages/patches/{xpra-4.2-install_libs.patch => xpra-5.0-install_libs.patch} (52%)
rename gnu/packages/patches/{xpra-4.2-systemd-run.patch => xpra-5.0-systemd-run.patch} (66%)

Toggle diff (49 lines)
diff --git a/gnu/packages/patches/xpra-4.2-install_libs.patch b/gnu/packages/patches/xpra-5.0-install_libs.patch
similarity index 52%
rename from gnu/packages/patches/xpra-4.2-install_libs.patch
rename to gnu/packages/patches/xpra-5.0-install_libs.patch
index 65d489a3b8..fd5394d931 100644
--- a/gnu/packages/patches/xpra-4.2-install_libs.patch
+++ b/gnu/packages/patches/xpra-5.0-install_libs.patch
@@ -1,18 +1,27 @@
-This workaround for Gentoo interferes with our use of --no-compile during
-the 'install stage.
-
---- a/setup.py 2022-01-04 10:10:05.039825000 +0100
-+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100
-@@ -589,8 +589,6 @@
- })
+diff --git a/setup.py b/setup.py
+index e254bf99c..90db55c3f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -663,8 +663,6 @@ if modules_ENABLED:
+ # Utility methods for building with Cython
def add_cython_ext(*args, **kwargs):
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
- assert cython_ENABLED, "cython compilation is disabled"
+ if not cython_ENABLED:
+ raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
- kwargs["define_macros"] = [
-@@ -1703,14 +1701,6 @@
+@@ -1809,9 +1807,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"install_data_override.run() root_prefix={root_prefix}")
+ build_xpra_conf(root_prefix)
+
+@@ -1955,13 +1950,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
@@ -23,7 +32,6 @@ the 'install stage.
- #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):
- pkgconfig = no_pkgconfig
--
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
- assert py2app is not None
Toggle diff (112 lines)
diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-5.0-systemd-run.patch
similarity index 66%
rename from gnu/packages/patches/xpra-4.2-systemd-run.patch
rename to gnu/packages/patches/xpra-5.0-systemd-run.patch
index 8dfd9c82f0..4343b2e8c1 100644
--- a/gnu/packages/patches/xpra-4.2-systemd-run.patch
+++ b/gnu/packages/patches/xpra-5.0-systemd-run.patch
@@ -1,13 +1,12 @@
-Disable systemd-run if the command is not found.
-
-diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
---- xpra-4.2~/xpra/scripts/main.py 2021-06-06 08:51:13.756815842 -0700
-+++ xpra-4.2/xpra/scripts/main.py 2021-06-06 16:07:13.371024486 -0700
-@@ -331,23 +331,26 @@
- if not is_systemd_pid1():
- return False # pragma: no cover
- #test it:
-- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index 3813331a5..46e2c83a6 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -337,23 +337,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)
@@ -15,13 +14,13 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
+- try:
- proc.terminate()
- except Exception:
- pass
-- try:
++ 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
@@ -41,5 +40,5 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
+ except FileNotFoundError:
+ return False
-
- def run_mode(script_file, error_cb, options, args, mode, defaults):
+ def verify_gir():
+ try:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 08cbd8d757..67e046f507 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cups)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -6110,16 +6111,16 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
- (version "4.4.6")
+ (version "5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
- (base32 "0d3s13wqbn9jwqp4i55mn4chgjkrckq3jx4jrq1bcjjz5agzfrq5"))
- (patches (search-patches "xpra-4.2-systemd-run.patch"
- "xpra-4.2-install_libs.patch"))))
+ (base32 "03mny5516g6iczp6cgbllpl0q2bz38nh2z7s36qjrlkfm9xc68cl"))
+ (patches (search-patches "xpra-5.0-systemd-run.patch"
+ "xpra-5.0-install_libs.patch"))))
(build-system python-build-system)
(inputs
(list bash-minimal ; for wrap-program
@@ -6158,7 +6159,8 @@ (define-public xpra
python-dbus ; For desktop notifications.
dbus ; For dbus-launch command.
python-lz4 ; Faster compression than zlib.
- python-netifaces))
+ python-netifaces
+ python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
(list
@@ -6193,7 +6195,7 @@ (define-public xpra
(format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py"
- "xpra/platform/xposix/paths.py")
+ "xpra/platform/posix/paths.py")
(("\"/etc/xpra/?\"")
(string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux)

base-commit: 2eb6df537c36da8bf8e81ff698421f6fb1bfd1ab
--
2.41.0
A
A
Andy Tai wrote on 19 Sep 2023 08:47
[PATCH v3] gnu: xpra: Update to 5.0.2
(address . 65849@debbugs.gnu.org)(name . Andy Tai)(address . ltai@roku.com)
d38be952d6a6fecc658ef570dad55df98974664b.1695106027.git.atai@atai.org
From: Andy Tai <ltai@roku.com>

* gnu/packages/xorg.scm (xpra): Update to 5.0.2.
[inputs]: Add cups.
* gnu/packages/patches/xpra-5.0-install_libs.patch: New file.
* gnu/packages/patches/xpra-5.0-systemd-run.patch: New file.
* gnu/packages/patches/xpra-4.2-install_libs.patch: Removed.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Removed.
---
...libs.patch => xpra-5.0-install_libs.patch} | 32 ++++++++++++-------
...d-run.patch => xpra-5.0-systemd-run.patch} | 31 +++++++++---------
gnu/packages/xorg.scm | 14 ++++----
3 files changed, 43 insertions(+), 34 deletions(-)
rename gnu/packages/patches/{xpra-4.2-install_libs.patch => xpra-5.0-install_libs.patch} (52%)
rename gnu/packages/patches/{xpra-4.2-systemd-run.patch => xpra-5.0-systemd-run.patch} (66%)

Toggle diff (49 lines)
diff --git a/gnu/packages/patches/xpra-4.2-install_libs.patch b/gnu/packages/patches/xpra-5.0-install_libs.patch
similarity index 52%
rename from gnu/packages/patches/xpra-4.2-install_libs.patch
rename to gnu/packages/patches/xpra-5.0-install_libs.patch
index 65d489a3b8..fd5394d931 100644
--- a/gnu/packages/patches/xpra-4.2-install_libs.patch
+++ b/gnu/packages/patches/xpra-5.0-install_libs.patch
@@ -1,18 +1,27 @@
-This workaround for Gentoo interferes with our use of --no-compile during
-the 'install stage.
-
---- a/setup.py 2022-01-04 10:10:05.039825000 +0100
-+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100
-@@ -589,8 +589,6 @@
- })
+diff --git a/setup.py b/setup.py
+index e254bf99c..90db55c3f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -663,8 +663,6 @@ if modules_ENABLED:
+ # Utility methods for building with Cython
def add_cython_ext(*args, **kwargs):
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
- assert cython_ENABLED, "cython compilation is disabled"
+ if not cython_ENABLED:
+ raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
- kwargs["define_macros"] = [
-@@ -1703,14 +1701,6 @@
+@@ -1809,9 +1807,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"install_data_override.run() root_prefix={root_prefix}")
+ build_xpra_conf(root_prefix)
+
+@@ -1955,13 +1950,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
@@ -23,7 +32,6 @@ the 'install stage.
- #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):
- pkgconfig = no_pkgconfig
--
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
- assert py2app is not None
Toggle diff (112 lines)
diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-5.0-systemd-run.patch
similarity index 66%
rename from gnu/packages/patches/xpra-4.2-systemd-run.patch
rename to gnu/packages/patches/xpra-5.0-systemd-run.patch
index 8dfd9c82f0..4343b2e8c1 100644
--- a/gnu/packages/patches/xpra-4.2-systemd-run.patch
+++ b/gnu/packages/patches/xpra-5.0-systemd-run.patch
@@ -1,13 +1,12 @@
-Disable systemd-run if the command is not found.
-
-diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
---- xpra-4.2~/xpra/scripts/main.py 2021-06-06 08:51:13.756815842 -0700
-+++ xpra-4.2/xpra/scripts/main.py 2021-06-06 16:07:13.371024486 -0700
-@@ -331,23 +331,26 @@
- if not is_systemd_pid1():
- return False # pragma: no cover
- #test it:
-- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index 3813331a5..46e2c83a6 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -337,23 +337,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)
@@ -15,13 +14,13 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
+- try:
- proc.terminate()
- except Exception:
- pass
-- try:
++ 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
@@ -41,5 +40,5 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
+ except FileNotFoundError:
+ return False
-
- def run_mode(script_file, error_cb, options, args, mode, defaults):
+ def verify_gir():
+ try:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 08cbd8d757..74d3994912 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cups)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -6110,16 +6111,16 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
- (version "4.4.6")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
- (base32 "0d3s13wqbn9jwqp4i55mn4chgjkrckq3jx4jrq1bcjjz5agzfrq5"))
- (patches (search-patches "xpra-4.2-systemd-run.patch"
- "xpra-4.2-install_libs.patch"))))
+ (base32 "0gxv0h1spg2jl3g9cc6qxxkq6a7prmb92dqqwk0s6pvrj8w3izlk"))
+ (patches (search-patches "xpra-5.0-systemd-run.patch"
+ "xpra-5.0-install_libs.patch"))))
(build-system python-build-system)
(inputs
(list bash-minimal ; for wrap-program
@@ -6158,7 +6159,8 @@ (define-public xpra
python-dbus ; For desktop notifications.
dbus ; For dbus-launch command.
python-lz4 ; Faster compression than zlib.
- python-netifaces))
+ python-netifaces
+ python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
(list
@@ -6193,7 +6195,7 @@ (define-public xpra
(format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py"
- "xpra/platform/xposix/paths.py")
+ "xpra/platform/posix/paths.py")
(("\"/etc/xpra/?\"")
(string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux)

base-commit: 7841a624f0c94efbfeb48a5209dbd92575eacc09
--
2.41.0
A
A
Andy Tai wrote on 20 Sep 2023 06:51
[PATCH v4] gnu: xpra: Update to 5.0.2
(address . 65849@debbugs.gnu.org)(name . Andy Tai)(address . ltai@roku.com)
d38be952d6a6fecc658ef570dad55df98974664b.1695185457.git.atai@atai.org
From: Andy Tai <ltai@roku.com>

* gnu/packages/xorg.scm (xpra): Update to 5.0.2.
[inputs]: Add cups.
* gnu/packages/patches/xpra-5.0-install_libs.patch: New file.
* gnu/packages/patches/xpra-5.0-systemd-run.patch: New file.
* gnu/packages/patches/xpra-4.2-install_libs.patch: Removed.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Removed.
---
...libs.patch => xpra-5.0-install_libs.patch} | 32 ++++++++++++-------
...d-run.patch => xpra-5.0-systemd-run.patch} | 31 +++++++++---------
gnu/packages/xorg.scm | 14 ++++----
3 files changed, 43 insertions(+), 34 deletions(-)
rename gnu/packages/patches/{xpra-4.2-install_libs.patch => xpra-5.0-install_libs.patch} (52%)
rename gnu/packages/patches/{xpra-4.2-systemd-run.patch => xpra-5.0-systemd-run.patch} (66%)

Toggle diff (49 lines)
diff --git a/gnu/packages/patches/xpra-4.2-install_libs.patch b/gnu/packages/patches/xpra-5.0-install_libs.patch
similarity index 52%
rename from gnu/packages/patches/xpra-4.2-install_libs.patch
rename to gnu/packages/patches/xpra-5.0-install_libs.patch
index 65d489a3b8..fd5394d931 100644
--- a/gnu/packages/patches/xpra-4.2-install_libs.patch
+++ b/gnu/packages/patches/xpra-5.0-install_libs.patch
@@ -1,18 +1,27 @@
-This workaround for Gentoo interferes with our use of --no-compile during
-the 'install stage.
-
---- a/setup.py 2022-01-04 10:10:05.039825000 +0100
-+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100
-@@ -589,8 +589,6 @@
- })
+diff --git a/setup.py b/setup.py
+index e254bf99c..90db55c3f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -663,8 +663,6 @@ if modules_ENABLED:
+ # Utility methods for building with Cython
def add_cython_ext(*args, **kwargs):
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
- assert cython_ENABLED, "cython compilation is disabled"
+ if not cython_ENABLED:
+ raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
- kwargs["define_macros"] = [
-@@ -1703,14 +1701,6 @@
+@@ -1809,9 +1807,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"install_data_override.run() root_prefix={root_prefix}")
+ build_xpra_conf(root_prefix)
+
+@@ -1955,13 +1950,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
@@ -23,7 +32,6 @@ the 'install stage.
- #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):
- pkgconfig = no_pkgconfig
--
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
- assert py2app is not None
Toggle diff (112 lines)
diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-5.0-systemd-run.patch
similarity index 66%
rename from gnu/packages/patches/xpra-4.2-systemd-run.patch
rename to gnu/packages/patches/xpra-5.0-systemd-run.patch
index 8dfd9c82f0..4343b2e8c1 100644
--- a/gnu/packages/patches/xpra-4.2-systemd-run.patch
+++ b/gnu/packages/patches/xpra-5.0-systemd-run.patch
@@ -1,13 +1,12 @@
-Disable systemd-run if the command is not found.
-
-diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
---- xpra-4.2~/xpra/scripts/main.py 2021-06-06 08:51:13.756815842 -0700
-+++ xpra-4.2/xpra/scripts/main.py 2021-06-06 16:07:13.371024486 -0700
-@@ -331,23 +331,26 @@
- if not is_systemd_pid1():
- return False # pragma: no cover
- #test it:
-- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index 3813331a5..46e2c83a6 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -337,23 +337,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)
@@ -15,13 +14,13 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
+- try:
- proc.terminate()
- except Exception:
- pass
-- try:
++ 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
@@ -41,5 +40,5 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
+ except FileNotFoundError:
+ return False
-
- def run_mode(script_file, error_cb, options, args, mode, defaults):
+ def verify_gir():
+ try:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 08cbd8d757..74d3994912 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cups)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -6110,16 +6111,16 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
- (version "4.4.6")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
- (base32 "0d3s13wqbn9jwqp4i55mn4chgjkrckq3jx4jrq1bcjjz5agzfrq5"))
- (patches (search-patches "xpra-4.2-systemd-run.patch"
- "xpra-4.2-install_libs.patch"))))
+ (base32 "0gxv0h1spg2jl3g9cc6qxxkq6a7prmb92dqqwk0s6pvrj8w3izlk"))
+ (patches (search-patches "xpra-5.0-systemd-run.patch"
+ "xpra-5.0-install_libs.patch"))))
(build-system python-build-system)
(inputs
(list bash-minimal ; for wrap-program
@@ -6158,7 +6159,8 @@ (define-public xpra
python-dbus ; For desktop notifications.
dbus ; For dbus-launch command.
python-lz4 ; Faster compression than zlib.
- python-netifaces))
+ python-netifaces
+ python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
(list
@@ -6193,7 +6195,7 @@ (define-public xpra
(format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py"
- "xpra/platform/xposix/paths.py")
+ "xpra/platform/posix/paths.py")
(("\"/etc/xpra/?\"")
(string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux)

base-commit: 7841a624f0c94efbfeb48a5209dbd92575eacc09
--
2.41.0
A
A
Andy Tai wrote on 21 Sep 2023 21:28
(address . 65849@debbugs.gnu.org)(name . Andy Tai)(address . ltai@roku.com)
CAJsg1E9108RwNwEWmuey34O7reCDi0EJ=872epyGfAKPX5ci7Q@mail.gmail.com
more changes needed, new patch coming
A
A
Andy Tai wrote on 22 Sep 2023 05:58
[PATCH v5] gnu: xpra: Update to 5.0.2
(address . 65849@debbugs.gnu.org)(name . Andy Tai)(address . ltai@roku.com)
5940d9f96a58bcb948f54adabe6fac6cd64f68e3.1695355042.git.atai@atai.org
From: Andy Tai <ltai@roku.com>

* gnu/packages/xorg.scm (xpra): Update to 5.0.2.
[inputs]: Add cups.
* gnu/packages/patches/xpra-5.0-install_libs.patch: New file.
* gnu/packages/patches/xpra-5.0-systemd-run.patch: New file.
* gnu/packages/patches/xpra-4.2-install_libs.patch: Removed.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Removed.
* gnu/local.mk (dist_patch_DATA): Reflect removal and addition.
---
gnu/local.mk | 4 +--
...libs.patch => xpra-5.0-install_libs.patch} | 32 ++++++++++++-------
...d-run.patch => xpra-5.0-systemd-run.patch} | 31 +++++++++---------
gnu/packages/xorg.scm | 14 ++++----
4 files changed, 45 insertions(+), 36 deletions(-)
rename gnu/packages/patches/{xpra-4.2-install_libs.patch => xpra-5.0-install_libs.patch} (52%)
rename gnu/packages/patches/{xpra-4.2-systemd-run.patch => xpra-5.0-systemd-run.patch} (66%)

Toggle diff (64 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index b059689954..570165874d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2131,8 +2131,8 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%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-4.2-systemd-run.patch \
- %D%/packages/patches/xpra-4.2-install_libs.patch \
+ %D%/packages/patches/xpra-5.0-systemd-run.patch \
+ %D%/packages/patches/xpra-5.0-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-4.2-install_libs.patch b/gnu/packages/patches/xpra-5.0-install_libs.patch
similarity index 52%
rename from gnu/packages/patches/xpra-4.2-install_libs.patch
rename to gnu/packages/patches/xpra-5.0-install_libs.patch
index 65d489a3b8..fd5394d931 100644
--- a/gnu/packages/patches/xpra-4.2-install_libs.patch
+++ b/gnu/packages/patches/xpra-5.0-install_libs.patch
@@ -1,18 +1,27 @@
-This workaround for Gentoo interferes with our use of --no-compile during
-the 'install stage.
-
---- a/setup.py 2022-01-04 10:10:05.039825000 +0100
-+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100
-@@ -589,8 +589,6 @@
- })
+diff --git a/setup.py b/setup.py
+index e254bf99c..90db55c3f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -663,8 +663,6 @@ if modules_ENABLED:
+ # Utility methods for building with Cython
def add_cython_ext(*args, **kwargs):
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
- assert cython_ENABLED, "cython compilation is disabled"
+ if not cython_ENABLED:
+ raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
- kwargs["define_macros"] = [
-@@ -1703,14 +1701,6 @@
+@@ -1809,9 +1807,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"install_data_override.run() root_prefix={root_prefix}")
+ build_xpra_conf(root_prefix)
+
+@@ -1955,13 +1950,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
@@ -23,7 +32,6 @@ the 'install stage.
- #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):
- pkgconfig = no_pkgconfig
--
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
- assert py2app is not None
Toggle diff (112 lines)
diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-5.0-systemd-run.patch
similarity index 66%
rename from gnu/packages/patches/xpra-4.2-systemd-run.patch
rename to gnu/packages/patches/xpra-5.0-systemd-run.patch
index 8dfd9c82f0..4343b2e8c1 100644
--- a/gnu/packages/patches/xpra-4.2-systemd-run.patch
+++ b/gnu/packages/patches/xpra-5.0-systemd-run.patch
@@ -1,13 +1,12 @@
-Disable systemd-run if the command is not found.
-
-diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
---- xpra-4.2~/xpra/scripts/main.py 2021-06-06 08:51:13.756815842 -0700
-+++ xpra-4.2/xpra/scripts/main.py 2021-06-06 16:07:13.371024486 -0700
-@@ -331,23 +331,26 @@
- if not is_systemd_pid1():
- return False # pragma: no cover
- #test it:
-- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index 3813331a5..46e2c83a6 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -337,23 +337,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)
@@ -15,13 +14,13 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
+- try:
- proc.terminate()
- except Exception:
- pass
-- try:
++ 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
@@ -41,5 +40,5 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
+ except FileNotFoundError:
+ return False
-
- def run_mode(script_file, error_cb, options, args, mode, defaults):
+ def verify_gir():
+ try:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cd1335661b..ec846093e2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cups)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -6110,16 +6111,16 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
- (version "4.4.6")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
- (base32 "0d3s13wqbn9jwqp4i55mn4chgjkrckq3jx4jrq1bcjjz5agzfrq5"))
- (patches (search-patches "xpra-4.2-systemd-run.patch"
- "xpra-4.2-install_libs.patch"))))
+ (base32 "0gxv0h1spg2jl3g9cc6qxxkq6a7prmb92dqqwk0s6pvrj8w3izlk"))
+ (patches (search-patches "xpra-5.0-systemd-run.patch"
+ "xpra-5.0-install_libs.patch"))))
(build-system python-build-system)
(inputs
(list bash-minimal ; for wrap-program
@@ -6158,7 +6159,8 @@ (define-public xpra
python-dbus ; For desktop notifications.
dbus ; For dbus-launch command.
python-lz4 ; Faster compression than zlib.
- python-netifaces))
+ python-netifaces
+ python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
(list
@@ -6193,7 +6195,7 @@ (define-public xpra
(format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py"
- "xpra/platform/xposix/paths.py")
+ "xpra/platform/posix/paths.py")
(("\"/etc/xpra/?\"")
(string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux)

base-commit: 5d2593be0a9a766dfb1d93490047940b7b81d381
--
2.41.0
C
C
Christopher Baines wrote on 25 Sep 2023 11:50
(name . Andy Tai)(address . atai@atai.org)
87msxa7f5w.fsf@cbaines.net
Andy Tai <atai@atai.org> writes:

Toggle quote (5 lines)
> From: Andy Tai <ltai@roku.com>
>
> * gnu/packages/xorg.scm (xpra): Update to 5.0.2.
> [inputs]: Add cups.

...

Toggle quote (5 lines)
> * gnu/packages/patches/xpra-5.0-install_libs.patch: New file.
> * gnu/packages/patches/xpra-5.0-systemd-run.patch: New file.
> * gnu/packages/patches/xpra-4.2-install_libs.patch: Removed.
> * gnu/packages/patches/xpra-4.2-systemd-run.patch: Removed.

This doesn't really capture what's going on here. The patches are being
updated for the new version, right?

We also seem to be loosing the descriptions of the patches that appear
at the tops of the file. I think guix lint should be reporting this.

Could you add the comments back, and ideally link to where these patches
have been sent upstream (or say why that isn't appropriate)?

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmURWHtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xf+jA//THNMlGyey9LDQygoHbvR3mh4xSHMDpRT
gR+Q2wxSSq2eIZSVb+vTWq+t9A2TPKyec0p0k/uNkQr1CYZNCHJm9GtLbJoGVi1d
vfNDAgnnL/+PTOGnmEaPCiN8NSszpdfsuexRVCiCTCiHaalQbJ6CncoH87UHnYmK
ST6I2sILkDVPaib12eAluWdxXnrC3U1W38Vh4rODnt0xfEhI2lb5mgsMnyxlysGZ
fLqWN0mOHy+NzkGQGAk/0zkb4jkS7BdREKexjV1LqKe7FLMfyaa3i0wd8cqzk1cJ
ipyGMYvmn6som/TGp9YMu0UM1/tzKPipx9gQLyQcNiU2sYqV0N0kWYBdo8sgctH4
IkA9EB/kh4Ljy6inVtg9bazMO2dTBgoBnI5xDxKA7uwJddtKboiEGXCI7BmBI+hX
P3bU9H5tdvzfgNoBKFj/4RR088lWhiamHrqcI0ghcSPsfZeZvLfkesgi7NlDn7bP
V2XmOXdnDJFt/74jgj//xIhzqjJ2Q5AJM4WUipMiYwlzLTFVqLsavrK/dMLM2JSs
3ugkaHiNEsRB84lIiX4MI8jSEe4n35k3Kwc1j0g8n/+LoeHbbO8oIuYLCdMdiX5V
C5gVvdQCdQ5z0tLpk8xdKZdvx3vODn8g8nb7bNbHkgNadwIJM150CUQsc+iXZE17
uUH6keg8kFI=
=6aOw
-----END PGP SIGNATURE-----

C
C
Christopher Baines wrote on 27 Sep 2023 12:54
tag 65849 moreinfo
(address . control@debbugs.gnu.org)
87ttrfevip.fsf@cbaines.net
tags 65849 + moreinfo
quit
A
A
Andy Tai wrote on 27 Sep 2023 18:36
[PATCH v6] gnu: xpra: Update to 5.0.2
(name . Andy Tai)(address . ltai@roku.com)
f6236e7e5d85333015cfe208883a09f1a8aea9ea.1695832480.git.atai@atai.org
From: Andy Tai <ltai@roku.com>

* gnu/packages/patches/xpra-4.2-install_libs.patch: Move to ...
* gnu/packages/patches/xpra-5.0-install_libs.patch: ... this file.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Move to ...
* gnu/packages/patches/xpra-5.0-systemd-run.patch: ... this file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
* gnu/packages/xorg.scm (xpra): Update to 5.0.2.
[source] <patches>: Rename per version changes
[inputs]: Add cups.
---
gnu/local.mk | 4 +--
...libs.patch => xpra-5.0-install_libs.patch} | 31 +++++++++++++------
...d-run.patch => xpra-5.0-systemd-run.patch} | 31 ++++++++++---------
gnu/packages/xorg.scm | 14 +++++----
4 files changed, 49 insertions(+), 31 deletions(-)
rename gnu/packages/patches/{xpra-4.2-install_libs.patch => xpra-5.0-install_libs.patch} (53%)
rename gnu/packages/patches/{xpra-4.2-systemd-run.patch => xpra-5.0-systemd-run.patch} (69%)

Toggle diff (66 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index bfa816d717..36417f1fe9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2131,8 +2131,8 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \
%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-4.2-systemd-run.patch \
- %D%/packages/patches/xpra-4.2-install_libs.patch \
+ %D%/packages/patches/xpra-5.0-systemd-run.patch \
+ %D%/packages/patches/xpra-5.0-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-4.2-install_libs.patch b/gnu/packages/patches/xpra-5.0-install_libs.patch
similarity index 53%
rename from gnu/packages/patches/xpra-4.2-install_libs.patch
rename to gnu/packages/patches/xpra-5.0-install_libs.patch
index 65d489a3b8..4d40bf1f79 100644
--- a/gnu/packages/patches/xpra-4.2-install_libs.patch
+++ b/gnu/packages/patches/xpra-5.0-install_libs.patch
@@ -1,18 +1,32 @@
+Distribution specific patch, not going upstream
+
This workaround for Gentoo interferes with our use of --no-compile during
the 'install stage.
---- a/setup.py 2022-01-04 10:10:05.039825000 +0100
-+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100
-@@ -589,8 +589,6 @@
- })
+diff --git a/setup.py b/setup.py
+index e254bf99c..90db55c3f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -663,8 +663,6 @@ if modules_ENABLED:
+ # Utility methods for building with Cython
def add_cython_ext(*args, **kwargs):
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
- return
- assert cython_ENABLED, "cython compilation is disabled"
+ if not cython_ENABLED:
+ raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
- kwargs["define_macros"] = [
-@@ -1703,14 +1701,6 @@
+@@ -1809,9 +1807,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"install_data_override.run() root_prefix={root_prefix}")
+ build_xpra_conf(root_prefix)
+
+@@ -1955,13 +1950,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
@@ -23,7 +37,6 @@ the 'install stage.
- #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):
- pkgconfig = no_pkgconfig
--
+
if OSX and "py2app" in sys.argv:
import py2app #@UnresolvedImport
- assert py2app is not None
Toggle diff (114 lines)
diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-5.0-systemd-run.patch
similarity index 69%
rename from gnu/packages/patches/xpra-4.2-systemd-run.patch
rename to gnu/packages/patches/xpra-5.0-systemd-run.patch
index 8dfd9c82f0..437a8cc37f 100644
--- a/gnu/packages/patches/xpra-4.2-systemd-run.patch
+++ b/gnu/packages/patches/xpra-5.0-systemd-run.patch
@@ -1,13 +1,16 @@
+Distriction specific patch, not going upstream
+
Disable systemd-run if the command is not found.
-diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
---- xpra-4.2~/xpra/scripts/main.py 2021-06-06 08:51:13.756815842 -0700
-+++ xpra-4.2/xpra/scripts/main.py 2021-06-06 16:07:13.371024486 -0700
-@@ -331,23 +331,26 @@
- if not is_systemd_pid1():
- return False # pragma: no cover
- #test it:
-- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
+index 3813331a5..46e2c83a6 100755
+--- a/xpra/scripts/main.py
++++ b/xpra/scripts/main.py
+@@ -337,23 +337,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)
@@ -15,13 +18,13 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
-+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
-+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
- try:
+- try:
- proc.terminate()
- except Exception:
- pass
-- try:
++ 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
@@ -41,5 +44,5 @@ diff -ru xpra-4.2~/xpra/scripts/main.py xpra-4.2/xpra/scripts/main.py
+ except FileNotFoundError:
+ return False
-
- def run_mode(script_file, error_cb, options, args, mode, defaults):
+ def verify_gir():
+ try:
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cd1335661b..ec846093e2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cups)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages flex)
@@ -6110,16 +6111,16 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
- (version "4.4.6")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
- (base32 "0d3s13wqbn9jwqp4i55mn4chgjkrckq3jx4jrq1bcjjz5agzfrq5"))
- (patches (search-patches "xpra-4.2-systemd-run.patch"
- "xpra-4.2-install_libs.patch"))))
+ (base32 "0gxv0h1spg2jl3g9cc6qxxkq6a7prmb92dqqwk0s6pvrj8w3izlk"))
+ (patches (search-patches "xpra-5.0-systemd-run.patch"
+ "xpra-5.0-install_libs.patch"))))
(build-system python-build-system)
(inputs
(list bash-minimal ; for wrap-program
@@ -6158,7 +6159,8 @@ (define-public xpra
python-dbus ; For desktop notifications.
dbus ; For dbus-launch command.
python-lz4 ; Faster compression than zlib.
- python-netifaces))
+ python-netifaces
+ python-pycups))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
(list
@@ -6193,7 +6195,7 @@ (define-public xpra
(format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py"
- "xpra/platform/xposix/paths.py")
+ "xpra/platform/posix/paths.py")
(("\"/etc/xpra/?\"")
(string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux)

base-commit: 15fdeaeb2d4df755811db92cc7c3c7cb19155dec
--
2.41.0
A
A
Andy Tai wrote on 27 Sep 2023 18:42
(name . GNU bug tracker automated control server)(address . control@debbugs.gnu.org)
CAJsg1E8+5mcP7hb80SxaaT4mmvU9jUWtbkxy+=O0OzO_J-Um9g@mail.gmail.com
tags 65849 - moreinfo
L
L
Ludovic Courtès wrote on 28 Sep 2023 11:30
(name . Andy Tai)(address . atai@atai.org)
87lecqy79v.fsf_-_@gnu.org
Hi,

Andy Tai <atai@atai.org> skribis:

Toggle quote (11 lines)
> From: Andy Tai <ltai@roku.com>
>
> * gnu/packages/patches/xpra-4.2-install_libs.patch: Move to ...
> * gnu/packages/patches/xpra-5.0-install_libs.patch: ... this file.
> * gnu/packages/patches/xpra-4.2-systemd-run.patch: Move to ...
> * gnu/packages/patches/xpra-5.0-systemd-run.patch: ... this file.
> * gnu/local.mk (dist_patch_DATA): Update accordingly.
> * gnu/packages/xorg.scm (xpra): Update to 5.0.2.
> [source] <patches>: Rename per version changes
> [inputs]: Add cups.

Applied, thanks!

Ludo’.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 65849@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 65849
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch