Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Sun, 10 Sep 2023 03:33:01 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65849 in the body.
You can then email your comments to 65849 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Sun, 10 Sep 2023 03:33:01 GMT) Full text and rfc822 format available.Andy Tai <atai <at> atai.org>:guix-patches <at> gnu.org.
(Sun, 10 Sep 2023 03:33:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: xpra: Update to 5.0.1 Date: Sat, 9 Sep 2023 20:31:00 -0700
[Message part 1 (text/plain, inline)]
[0001-gnu-xpra-Update-to-5.0.1.patch (text/x-patch, attachment)]
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Mon, 11 Sep 2023 03:51:02 GMT) Full text and rfc822 format available.Message #8 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v2] gnu: xpra: Update to 5.0.1 Date: Sun, 10 Sep 2023 20:50:17 -0700
From 9d1118eab79d4fe7fa20490209780dbd88c9fbb0 Mon Sep 17 00:00:00 2001
Message-Id: <9d1118eab79d4fe7fa20490209780dbd88c9fbb0.1694305735.git.ltai <at> roku.com>
From: Andy Tai <ltai <at> roku.com>
Date: Sat, 9 Sep 2023 17:26:39 -0700
Subject: [PATCH] gnu: xpra: Update to 5.0.1
To: guix-patches <at> 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%)
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
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
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Tue, 19 Sep 2023 06:49:02 GMT) Full text and rfc822 format available.Message #11 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org Cc: Andy Tai <ltai <at> roku.com> Subject: [PATCH v3] gnu: xpra: Update to 5.0.2 Date: Mon, 18 Sep 2023 23:47:45 -0700
From: Andy Tai <ltai <at> 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%)
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
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
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Wed, 20 Sep 2023 04:52:02 GMT) Full text and rfc822 format available.Message #14 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org Cc: Andy Tai <ltai <at> roku.com> Subject: [PATCH v4] gnu: xpra: Update to 5.0.2 Date: Tue, 19 Sep 2023 21:51:23 -0700
From: Andy Tai <ltai <at> 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%)
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
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
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Thu, 21 Sep 2023 19:30:02 GMT) Full text and rfc822 format available.Message #17 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org Cc: Andy Tai <ltai <at> roku.com> Subject: Re: [PATCH v4] gnu: xpra: Update to 5.0.2 Date: Thu, 21 Sep 2023 12:28:46 -0700
more changes needed, new patch coming
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Fri, 22 Sep 2023 03:59:01 GMT) Full text and rfc822 format available.Message #20 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org Cc: Andy Tai <ltai <at> roku.com> Subject: [PATCH v5] gnu: xpra: Update to 5.0.2 Date: Thu, 21 Sep 2023 20:58:32 -0700
From: Andy Tai <ltai <at> 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%)
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
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
guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Mon, 25 Sep 2023 09:54:01 GMT) Full text and rfc822 format available.Message #23 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Christopher Baines <mail <at> cbaines.net> To: Andy Tai <atai <at> atai.org> Cc: Andy Tai <ltai <at> roku.com>, 65849 <at> debbugs.gnu.org Subject: Re: [bug#65849] [PATCH v5] gnu: xpra: Update to 5.0.2 Date: Mon, 25 Sep 2023 10:50:30 +0100
[Message part 1 (text/plain, inline)]
Andy Tai <atai <at> atai.org> writes: > From: Andy Tai <ltai <at> 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. 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
[signature.asc (application/pgp-signature, inline)]
Christopher Baines <mail <at> cbaines.net>
to control <at> debbugs.gnu.org.
(Wed, 27 Sep 2023 10:55:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#65849; Package guix-patches.
(Wed, 27 Sep 2023 16:37:01 GMT) Full text and rfc822 format available.Message #28 received at 65849 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 65849 <at> debbugs.gnu.org, mail <at> cbaines.net Cc: Andy Tai <ltai <at> roku.com> Subject: [PATCH v6] gnu: xpra: Update to 5.0.2 Date: Wed, 27 Sep 2023 09:36:13 -0700
From: Andy Tai <ltai <at> 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%)
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
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
Andy Tai <atai <at> atai.org>
to control <at> debbugs.gnu.org.
(Wed, 27 Sep 2023 16:44:02 GMT) Full text and rfc822 format available.Ludovic Courtès <ludo <at> gnu.org>:Andy Tai <atai <at> atai.org>:Message #35 received at 65849-done <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Andy Tai <atai <at> atai.org> Cc: 65849-done <at> debbugs.gnu.org, mail <at> cbaines.net, Andy Tai <ltai <at> roku.com> Subject: Re: bug#65849: [PATCH] gnu: xpra: Update to 5.0.1 Date: Thu, 28 Sep 2023 11:30:20 +0200
Hi, Andy Tai <atai <at> atai.org> skribis: > From: Andy Tai <ltai <at> 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’.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 26 Oct 2023 11:24:13 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.