Andy Tai <atai@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 65849) by debbugs.gnu.org; 27 Sep 2023 16:36:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 27 12:36:43 2023
Received: from localhost ([127.0.0.1]:52343 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qlXWl-0001xy-3T
for submit <at> debbugs.gnu.org; Wed, 27 Sep 2023 12:36:43 -0400
Received: from mail-ot1-x335.google.com ([2607:f8b0:4864:20::335]:57492)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qlXWi-0001xh-Kx
for 65849 <at> debbugs.gnu.org; Wed, 27 Sep 2023 12:36:42 -0400
Received: by mail-ot1-x335.google.com with SMTP id
46e09a7af769-6c4e30a3604so4363275a34.2
for <65849 <at> debbugs.gnu.org>; Wed, 27 Sep 2023 09:36:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1695832581; x=1696437381; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=ww3MArLo4yUZ1cpex0L9to2zIM4RBpCkavMTxpjumiU=;
b=iy4bbhbSDsRulKJeV+sg4v5tRaRwDWB5R6ILt81IV3RFPBuU6lwN6BRtv7vghLdb99
J2QwOJPzRZds2xzCLloFYeOPBxx7sE6Te5Sfq438Nc5WE2IuM/Dv635vjO3dk5uiMbCe
3syfP5PKIdnRz9ai9fNWwveW9/JchkH7A30gqpcx7x2veAHHMJuboZ5+n/NgwkpazGwv
xyetAx7mI+f0SOzhoz7NvzUEPampEEoB6OKXXa7y+6y5B9Jjzrjs67oOH5b9HLH+ks6/
kW3MGnt0Nm/6E+jUY9hmv8jIyZFFCKrTYEr62j5gJNZ/61rsYqmo4/TJh+Zn44KNW5po
zEwA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1695832581; x=1696437381;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=ww3MArLo4yUZ1cpex0L9to2zIM4RBpCkavMTxpjumiU=;
b=OpA+rOko8NI5fxTcgbzvF20QrPisIOaf6Fo0vueE70E3+/2/WrR4hfg6oykG1p2+8W
4E4Yrec+jrHXM1Hvv83D11w1gBsUvNaPzVO4GmlD83zzwyfEgDCvOCWoLXhpM9Rb3x6n
uwt4QvSkLyFulDYuEMDg+W3lW+OHcR1ChALbTyKMILa9JU1asAFMrVtEbz2AmciY8DxL
cJMxXfvyxKBk+53PwqCdeFuol3QPuHaur6Fn5W5qPpY/N5X8nuOAVW5atbPgJU2NQrnC
uRgAhL0nFBnszu6O1oFphhcnMbSTs2USY2DVJOsktGOWE1C0kP9l/ifVdxGxAjHFu810
Wi/w==
X-Gm-Message-State: AOJu0YxjeA8xR5Elwr7ykYMKZ8OaVCLQV57gpLEadFzO10sPHhZnRxUx
ljtOfVYxbAqZUU0szvSbpH8mwRnZyN0=
X-Google-Smtp-Source: AGHT+IFadVhenk4otOWO1Q3lL3xMXoU8SR7KR+TqCTyWRfcGsklGKL/5XEBq1rUBFgUgD8uJjAaIkw==
X-Received: by 2002:a05:6358:930e:b0:143:7d73:6e63 with SMTP id
x14-20020a056358930e00b001437d736e63mr2972577rwa.2.1695832579140;
Wed, 27 Sep 2023 09:36:19 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
fb12-20020a056a002d8c00b00690c7552098sm10170947pfb.44.2023.09.27.09.36.18
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 27 Sep 2023 09:36:18 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65849 <at> debbugs.gnu.org,
mail@HIDDEN
Subject: [PATCH v6] gnu: xpra: Update to 5.0.2
Date: Wed, 27 Sep 2023 09:36:13 -0700
Message-ID: <f6236e7e5d85333015cfe208883a09f1a8aea9ea.1695832480.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65849
Cc: Andy Tai <ltai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
From: Andy Tai <ltai@HIDDEN>
* 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
guix-patches@HIDDEN:bug#65849; Package guix-patches.
Full text available.Christopher Baines <mail@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 65849) by debbugs.gnu.org; 25 Sep 2023 09:53:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 25 05:53:18 2023 Received: from localhost ([127.0.0.1]:44245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qkiHG-00064j-Jn for submit <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:53:18 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:54709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1qkiHE-00064a-0d for 65849 <at> debbugs.gnu.org; Mon, 25 Sep 2023 05:53:18 -0400 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 6B23127BBE2; Mon, 25 Sep 2023 10:53:02 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 76667b19; Mon, 25 Sep 2023 09:53:01 +0000 (UTC) References: <CAJsg1E_4GhMMqhAmkPcY+qwmPv8pukJJUSRu_pj0-8jqdQsgjA@HIDDEN> <5940d9f96a58bcb948f54adabe6fac6cd64f68e3.1695355042.git.atai@HIDDEN> User-agent: mu4e 1.10.5; emacs 28.2 From: Christopher Baines <mail@HIDDEN> To: Andy Tai <atai@HIDDEN> Subject: Re: [bug#65849] [PATCH v5] gnu: xpra: Update to 5.0.2 Date: Mon, 25 Sep 2023 10:50:30 +0100 In-reply-to: <5940d9f96a58bcb948f54adabe6fac6cd64f68e3.1695355042.git.atai@HIDDEN> Message-ID: <87msxa7f5w.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 65849 Cc: Andy Tai <ltai@HIDDEN>, 65849 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Andy Tai <atai@HIDDEN> writes: > From: Andy Tai <ltai@HIDDEN> > > * 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --=-=-=--
guix-patches@HIDDEN:bug#65849; Package guix-patches.
Full text available.
Received: (at 65849) by debbugs.gnu.org; 22 Sep 2023 03:59:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 21 23:59:00 2023
Received: from localhost ([127.0.0.1]:35096 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qjXJj-0003PN-SG
for submit <at> debbugs.gnu.org; Thu, 21 Sep 2023 23:59:00 -0400
Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:50682)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qjXJe-0003P3-RS
for 65849 <at> debbugs.gnu.org; Thu, 21 Sep 2023 23:58:57 -0400
Received: by mail-pf1-x42a.google.com with SMTP id
d2e1a72fcca58-690f9c787baso1469334b3a.1
for <65849 <at> debbugs.gnu.org>; Thu, 21 Sep 2023 20:58:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1695355118; x=1695959918; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=HI4245TrMvxU2wipA0/BPqQxYbAJMpOjeDYopnXLoYo=;
b=nBMRDm1Yx5tbVHOWekrhjEZ5L2bJkDi5rbJJeaY4f7HUS+u2LdC1iKWw+fYr9x5cA2
7jMSFv3KL0b8g72cGa1w/eaZH0SAta20dpq7ltLAMMYc+73Ei4D4dLD/5wgfBc8wvit2
wKjYkrrr3Z8DDJmLIeV13S3kABRFx2BRIGeBzpFxMHUmq9cvUkODqoEWLMIN/YNkTe+R
xbdl5aQ1k/6+s5b0LwfWCCjQ76MWgE9aAM6K7tQanYgtQtD0soGlkPOSIWjFb+m2wEnt
xxqpnQqU5fZ3bbG6w9xvbKp3Z9mS2nLwKuot6mtv3VJkFP7/k3MxxqScl2RcacNZ0zxK
Ab8w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1695355118; x=1695959918;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=HI4245TrMvxU2wipA0/BPqQxYbAJMpOjeDYopnXLoYo=;
b=rHM7qPeiCCYE9qp4pUiYASPjhPIZuZCUWIOBepnmFZ4t902TD7NIQm6vxoLFIF83ID
TJ1x3mrkAB79mHcFIL7g1w2B6q2ByujRMv/E6WcfxMkW2c3Z48XhmVs4P/j0jjxYAp0n
1s8kL9o6CVyFw0sSpnoSNzGXhXR15dcY8C/YrOT2vUwjmGhKqJAa3bpoEmrd/oF1AAyK
y8HlsUtrxYt+cZBioP5+x162+73oUM/S5OiXm2tWn/Pe0Q0YPtLhQC2l1pPtIrXZNlGP
XdnTESMwb29X7zMsQwcZ27QklHvSWVgaXI970N1E0VQtCTk0FJux1f450zXuHULS71dF
HOjw==
X-Gm-Message-State: AOJu0YxwZb6U/rZNcapiWnHrZvMGyTDOOtEVtV4l/trea30orkRsBARl
k6qA7XdJYBv4owo+7tUO25XuVgPh8sA=
X-Google-Smtp-Source: AGHT+IFCCjoVC7wmMqMjuAgnJM07Cwd33/vqFi0S8ajXLQh20HCrOwXjXGnqj0CATO3J1dc4MatHtg==
X-Received: by 2002:a05:6a20:9192:b0:126:9081:2156 with SMTP id
v18-20020a056a20919200b0012690812156mr7247233pzd.4.1695355117865;
Thu, 21 Sep 2023 20:58:37 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
t11-20020a17090b018b00b0027669cbc30asm3415046pjs.1.2023.09.21.20.58.37
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 21 Sep 2023 20:58:37 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65849 <at> debbugs.gnu.org
Subject: [PATCH v5] gnu: xpra: Update to 5.0.2
Date: Thu, 21 Sep 2023 20:58:32 -0700
Message-ID: <5940d9f96a58bcb948f54adabe6fac6cd64f68e3.1695355042.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65849
Cc: Andy Tai <ltai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
From: Andy Tai <ltai@HIDDEN>
* 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@HIDDEN:bug#65849; Package guix-patches.
Full text available.Received: (at 65849) by debbugs.gnu.org; 21 Sep 2023 19:29:41 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 21 15:29:41 2023 Received: from localhost ([127.0.0.1]:34846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qjPMr-0006lz-Hq for submit <at> debbugs.gnu.org; Thu, 21 Sep 2023 15:29:41 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]:42125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>) id 1qjPMp-0006lk-FP for 65849 <at> debbugs.gnu.org; Thu, 21 Sep 2023 15:29:40 -0400 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-5739965a482so746009eaf.0 for <65849 <at> debbugs.gnu.org>; Thu, 21 Sep 2023 12:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1695324563; x=1695929363; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=cJ+k8YRccAQI8vZ6MuLR0iRYNcijQ3tsoLCtu25lzu0=; b=NxfPJzQFdfJaxNu75dsFbKk2CwvhCvGafoHaRiekzKSjnUixdGI+I6yVsHtjjWy87s KXHeLRxCaJm1BSZLUYttXNryUij70s6mRGw4aGG3JYChmIqv1JNAhoBOxv7FqBI5yiKz 3NzQW4Ji/FK38ecx1cPIrJQK9wtTd+ByCuhcV6CDZqVdSpldEquqXl65s+C/CXREZrFm ifrmRBGr1qJZ/pB3YXr9EuOEJ8VG1SqmBX6SLjN99J12cAMGpMY+pw2De6GKJLzxOeds MFQEQM3KBE/9SYImrfByKH5DXXTIQfi8pf5Z/XDAepRLkIQo7FVTMItqj+Z4pdnlL0lJ p4DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695324563; x=1695929363; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cJ+k8YRccAQI8vZ6MuLR0iRYNcijQ3tsoLCtu25lzu0=; b=OQELiOiQ7RzWFfCsnrC0WKJlMbUaz7Uv8mnHIua1dZXJf+3WeYkEZD0jndeXYq7Rqu +kxDbyTX1surapEIO93sGcA/3IQKee5lnOoj/fZJqeRoOw8tprYUXJoh85A6hcci4Ku/ LCYbrTWCxoS9JyI5dxiwigi0AQc7EbwPAOz6uMU3ytkHqud8eOh8yvNmBHxyBauK9kNk u8GshQgDe73rG7VlojRMKGE7rM8/g+rGrRVWq80hfapWLKCjVmTSibYcFKjvFoqLHs6I jU0+9erVdkaKck6StD125ddRPUPTNAC4ZqYjoy3wESwjTHEM+q6eJt7pZN+ykaj+YKDb J4Tw== X-Gm-Message-State: AOJu0Yxcbx5PReYnI/8lmnBFA9ydK5BSuS41rxFQftVoAxZ+eVvBvxwb cAq8YAUMjEDzCwrU38PgoZ5XMh+3bYN8n/58Y+nX6uXq X-Google-Smtp-Source: AGHT+IFr7bZELTbF4+YJl8nDYcuyu073+3FtbA8ysqheZIq2u0m4C5xwRRN8DFZq8jSAOtxtYWQlWQT78GI/asmraNA= X-Received: by 2002:a05:6870:2188:b0:1d7:b3b4:4b8d with SMTP id l8-20020a056870218800b001d7b3b44b8dmr328530oae.0.1695324563165; Thu, 21 Sep 2023 12:29:23 -0700 (PDT) MIME-Version: 1.0 References: <d38be952d6a6fecc658ef570dad55df98974664b.1695185457.git.atai@HIDDEN> In-Reply-To: <d38be952d6a6fecc658ef570dad55df98974664b.1695185457.git.atai@HIDDEN> From: Andy Tai <atai@HIDDEN> Date: Thu, 21 Sep 2023 12:28:46 -0700 Message-ID: <CAJsg1E9108RwNwEWmuey34O7reCDi0EJ=872epyGfAKPX5ci7Q@HIDDEN> Subject: Re: [PATCH v4] gnu: xpra: Update to 5.0.2 To: 65849 <at> debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 65849 Cc: Andy Tai <ltai@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) more changes needed, new patch coming
guix-patches@HIDDEN:bug#65849; Package guix-patches.
Full text available.
Received: (at 65849) by debbugs.gnu.org; 20 Sep 2023 04:51:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Sep 20 00:51:51 2023
Received: from localhost ([127.0.0.1]:58031 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qipBj-000733-Vp
for submit <at> debbugs.gnu.org; Wed, 20 Sep 2023 00:51:51 -0400
Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:46367)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qipBf-00072j-4i
for 65849 <at> debbugs.gnu.org; Wed, 20 Sep 2023 00:51:46 -0400
Received: by mail-pj1-x1034.google.com with SMTP id
98e67ed59e1d1-276c0163e7dso460357a91.1
for <65849 <at> debbugs.gnu.org>; Tue, 19 Sep 2023 21:51:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1695185487; x=1695790287; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=ZXqAT+pQr/v/hdunR/FqPMdKuzYd7372VZsjF8JNefs=;
b=Y9VYxN3+aZVgJcQ1wHyKeC8H0dmdpTOx3RDGwSeh3NATa4LMUskoIohl5qQwnYpcQW
KdJrcDskWmYhQdsDjGc1e9lCBhDhphiEH+U1T/iBh68YXXX9KJR05t2DMUPPJfcMxvIf
OZJS+/Dz8bQ7bwXsSKIuEeFegwmi4VvpLfjGiYTOaRyZ3Y3L7FGF8wON8GgMs96MiJXm
xpMtQUvxFUBVV8LoS7P/S/oxuRqsOFi3lYVUg8VylgX3QeP4kbH4oa21iJg16RKqwoI2
8Gf80TYbYPLscEGJo6iDk6RLc/YDGEfpYaPL8u+zflUYEiT1k5JzBfgb2COOudicak/u
ne3Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1695185487; x=1695790287;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=ZXqAT+pQr/v/hdunR/FqPMdKuzYd7372VZsjF8JNefs=;
b=AsRHKMOoTBOi2Ui5l97CC7xPQdCGD4Ti6BE7Q1NjiTSk9a8qZQ4oVdBr74vuVIdiUv
wrhj43mqXMommwbEdLTSSxNWpGxJ+5UMUFeSJQITX0Hv3hQgLHjKc99Ip4pAAbA3I/ca
UUtP496pEFuz3J4m4AgoD7aAtWzXbsPp2/gvkqySl8knTrwl0IRVdxWOFk3iDxo43g61
J4B/8CEoA7zfH3Wyd7JcFqwhL/C8a/Prm0+CLs8nW3/E8t+AZqK3XEA5ZHKpg/oBcbIg
6BQUvgTI9UYePDpLw9T6tWTCAD85vbRYXuRYQtM3OfWB+SMLmLlkPIX8JkmGiXy+AxMH
FfWQ==
X-Gm-Message-State: AOJu0YwXPpUSt0WHXLFyjw8SNFnaAwjuGwx5ZYDH01pOXf+p3hvKnx4o
lqeOFYoSuTYRUZSG5QQfxIqUXNzECsw=
X-Google-Smtp-Source: AGHT+IHBLNVJ3z21i3S7bqtjG88UlYt5oO9OU+R6QXsS56NmnRwVVIrTjz/XwDm5m20ka6FYF99eag==
X-Received: by 2002:a17:90a:98e:b0:274:8249:a85f with SMTP id
14-20020a17090a098e00b002748249a85fmr1584567pjo.21.1695185487446;
Tue, 19 Sep 2023 21:51:27 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
x11-20020a17090abc8b00b0026d6ad176c6sm766245pjr.0.2023.09.19.21.51.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 Sep 2023 21:51:27 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65849 <at> debbugs.gnu.org
Subject: [PATCH v4] gnu: xpra: Update to 5.0.2
Date: Tue, 19 Sep 2023 21:51:23 -0700
Message-ID: <d38be952d6a6fecc658ef570dad55df98974664b.1695185457.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65849
Cc: Andy Tai <ltai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
From: Andy Tai <ltai@HIDDEN>
* 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@HIDDEN:bug#65849; Package guix-patches.
Full text available.
Received: (at 65849) by debbugs.gnu.org; 19 Sep 2023 06:48:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 19 02:48:10 2023
Received: from localhost ([127.0.0.1]:55202 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qiUWn-0000rQ-E1
for submit <at> debbugs.gnu.org; Tue, 19 Sep 2023 02:48:10 -0400
Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:56349)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qiUWj-0000qA-LY
for 65849 <at> debbugs.gnu.org; Tue, 19 Sep 2023 02:48:08 -0400
Received: by mail-pf1-x429.google.com with SMTP id
d2e1a72fcca58-690bccb0d8aso626013b3a.0
for <65849 <at> debbugs.gnu.org>; Mon, 18 Sep 2023 23:47:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1695106071; x=1695710871; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=ZXqAT+pQr/v/hdunR/FqPMdKuzYd7372VZsjF8JNefs=;
b=YqHacmZnsKzjUtX4mhlrfLJnqDB990RMoGf7YpkQa0Pf4eCqwbRTPHFlKfnH9Qv/tV
KpQKSWMa/wlPLdeweXor5I6CXfAmMVw9Dx6Tq64WbZgQ1rvqoS/Tf7ELGmVpFmhuYdI1
72g8dg819oA8+huEz4J2tu7OehN/KrDq3gvLzFzeozr6+8IIH39kECQ46QWRdQs1j3kN
q6iZg9CiY/2YCPxKTaB2L8V2XLWEnWZr3Qsxg7rZgIxTTnc503iR5mhl/G6v3flfHZQM
nGFGnxbLXLm26XGQWFV6FqZPWXZ6M1VxGhJ6NjrPS4SQ2z0msLcFWAsg7I7E9x8alU84
oo2w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1695106071; x=1695710871;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=ZXqAT+pQr/v/hdunR/FqPMdKuzYd7372VZsjF8JNefs=;
b=X2VyyZw/c7/ABFS7BtR12hWUHn9fPYTJfIntivO/aPJKTPcWvDEj9RuqQaaq8hBMEg
8VbdNYsOhnLpveBBwL/kHkQniYr6mivyoi2DoZ1u+6PqST41uBgP0PaxebcP2QfUXnoA
2ABeJRAObKfiF0qb7W8Tv00JgqNZdbx908at0VaPuFIbafMvJGSCybKCzTp8ksPrQVXY
A+hw4fVLK9z35hUHEThxdRMjn5Y0VDpb1soNzzfiMZhRmviQPJtzyTANpithS9WRiJly
G8IIr2rXuLTiFPz7RPzuet1wcPqbqrwEVmNfGm+Mf0w7UUReqst2W0Ht5COLB5+EjIjt
DtUQ==
X-Gm-Message-State: AOJu0Yxj0t4Md1FgrgBpKI1X0RCpautMqRobb0GjbtuKnZ061gBrO3to
6LBwy01pegr42qv43QsvUe1Jextzkqw=
X-Google-Smtp-Source: AGHT+IG8ji05IerQEskTOssuqAPt6mRfnkMvOLSuyc05n28HLepJNHFYdHTds2WfwiupUAPsYnOQeg==
X-Received: by 2002:a05:6a20:564c:b0:14c:d494:77c3 with SMTP id
is12-20020a056a20564c00b0014cd49477c3mr8495651pzc.33.1695106070614;
Mon, 18 Sep 2023 23:47:50 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
t11-20020a17090b018b00b0027669cbc30asm204784pjs.1.2023.09.18.23.47.49
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 18 Sep 2023 23:47:49 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65849 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: xpra: Update to 5.0.2
Date: Mon, 18 Sep 2023 23:47:45 -0700
Message-ID: <d38be952d6a6fecc658ef570dad55df98974664b.1695106027.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65849
Cc: Andy Tai <ltai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
From: Andy Tai <ltai@HIDDEN>
* 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@HIDDEN:bug#65849; Package guix-patches.
Full text available.
Received: (at 65849) by debbugs.gnu.org; 11 Sep 2023 03:50:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 23:50:39 2023
Received: from localhost ([127.0.0.1]:51722 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfXwb-0004ey-1w
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 23:50:39 -0400
Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:49177)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qfXwV-0004eg-Fj
for 65849 <at> debbugs.gnu.org; Sun, 10 Sep 2023 23:50:35 -0400
Received: by mail-pj1-x102b.google.com with SMTP id
98e67ed59e1d1-26b44247123so3185642a91.2
for <65849 <at> debbugs.gnu.org>; Sun, 10 Sep 2023 20:50:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694404221; x=1695009021; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=qcQqpu63dH0S741IJEj9d2VZJufFyAm4DsVshOau92w=;
b=qBoR3Pd/hit1QCHPNVyjfR3j5LcGMHeZjH92lW/ukyM6Yf++7ZS4khMI2irstXNJI3
mfsVKDiJFK5tjdmVhFUEMVQ+3jQGg94mmgTEa3FKG2GYdJhu2pq4bDnL9jHCtYpnTnH1
yt6/rl4wTeUEeG3GinsznkQC2h17pSVC8JSSPIJV+0k8yGo5eaC7DS4gE6HbqNYgNW9x
nXh76DpHXsaeVaKA78BuwasVKwjFobFvbbWqRBMLVmyQ8gdHCZwUZRKt4p3aypIS3QRL
/4BDkXHgJEspJ70rC/Hz5JFvicEAjtDK/9aWUHTr6eAVBbgieNUbTaeDJ8VJZVzcTlGT
Ealg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694404221; x=1695009021;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=qcQqpu63dH0S741IJEj9d2VZJufFyAm4DsVshOau92w=;
b=T+DUOKzUScRW0fz4di4GU2CH8BmF5lbL5wxicK12Ttx4YTXpfF8I6/bfNGMDiyJrpL
hVfdJQvMDAUzsJmKTfpQeFQkwIrcIoBt+4mILSNt02Mux6mANe1YDRp/00ZhWeXMsr2r
Yd0qXgRpcqIjOl4qUCge4i9slpeYLSAALc6E84TLmgDqWVa0lbNzp40Kj24LR3sr/yvN
SGTTnBBD7lhoOxdwV34yFebylMr/gioOJeIvsqriS6I8qqN33jYB8R2DbNmVTGKa6sG/
WgO0PdOfdl3AFXS9aTDuRqwpyJZTBEoJhFLkQOmpPfaehjvHQx/nwdMijFSjiSqbINAT
3hCg==
X-Gm-Message-State: AOJu0YzgeMzuzq9EAU1moFeFvmL0vIMOJ2v+aR+M2cGUusdGbbgujWEg
2JYRtLovgTgZ/cWSs/EDC7BHWb3mJgG2mw==
X-Google-Smtp-Source: AGHT+IGwY7l2/gPdWWxQKxNpWVK3oXHa88bpH15CmSm9tlaD0dpir3f+1J5wr8pGxFogt/AgIewlAQ==
X-Received: by 2002:a17:90a:868a:b0:260:d40f:6ade with SMTP id
p10-20020a17090a868a00b00260d40f6ademr7751862pjn.15.1694404221370;
Sun, 10 Sep 2023 20:50:21 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
z10-20020a17090a8b8a00b002676e961261sm9482076pjn.1.2023.09.10.20.50.20
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 20:50:20 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65849 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: xpra: Update to 5.0.1
Date: Sun, 10 Sep 2023 20:50:17 -0700
Message-ID: <3311247b0b9368e217e37b7810e0a86f5f32c78c.1694404192.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65849
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
From 9d1118eab79d4fe7fa20490209780dbd88c9fbb0 Mon Sep 17 00:00:00 2001
Message-Id: <9d1118eab79d4fe7fa20490209780dbd88c9fbb0.1694305735.git.ltai@HIDDEN>
From: Andy Tai <ltai@HIDDEN>
Date: Sat, 9 Sep 2023 17:26:39 -0700
Subject: [PATCH] gnu: xpra: Update to 5.0.1
To: guix-patches@HIDDEN
* 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@HIDDEN:bug#65849; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 03:32:39 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 09 23:32:39 2023 Received: from localhost ([127.0.0.1]:48677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qfBBf-00064k-26 for submit <at> debbugs.gnu.org; Sat, 09 Sep 2023 23:32:39 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>) id 1qfBBa-00064V-IO for submit <at> debbugs.gnu.org; Sat, 09 Sep 2023 23:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>) id 1qfBBR-0002ah-Jt for guix-patches@HIDDEN; Sat, 09 Sep 2023 23:32:25 -0400 Received: from mail-oo1-xc33.google.com ([2607:f8b0:4864:20::c33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>) id 1qfBBO-0008L0-0S for guix-patches@HIDDEN; Sat, 09 Sep 2023 23:32:25 -0400 Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-5738cb00eebso2158774eaf.2 for <guix-patches@HIDDEN>; Sat, 09 Sep 2023 20:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20230601.gappssmtp.com; s=20230601; t=1694316740; x=1694921540; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=pPDwRncfUhiFR1MXAnYX0dzmZx+qA/FOXlQNeO1K3ZM=; b=sfnkAynywDUnza40cuoHm5vdJw6G/pkXEkUj1rFDcIDgZOIu77SAtTYwFgN1e9bABW STo5IFJEXiaSDfITU/s34sRT1Mw1ykypZiTWjP+PNxSf6jhDn8bIVMyDI5YkUsP0y3qh TIcNz3qf9uPo2t5k0bWpQOzG8C1NPm1KVqCxv9d0+c4++kMxwYurnO4JWulRZgRBuygM WH+ItNKKzWc5527JdC/t46/jUZObwIftf/HaJHnmDspIDl5apZjWKucFMaicJbNfd6s2 zYgIirAS3MZovRsVGS5LW+Z4tWgoevZRcaiT7fLaWoB8lNfBjpctpYvU3ekIZOYUYcm6 F8ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694316740; x=1694921540; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pPDwRncfUhiFR1MXAnYX0dzmZx+qA/FOXlQNeO1K3ZM=; b=eCpZGIW3jSr4RIImEftQzk7ynyZYuoFzpAqfQg6sVA1SDMdpIZ0zOpl90TrCcw8lEb /8562s2GRQa6NZ1gzAf1OZJe+q7KcBQn/QwD+jRcoX20EIHk9tdwtdf1xFI1tTXvLxyh EpgyMjD/lVyqdBeopWmU4JmhPtKTkbd3A3CMiTSQQ9FThstyWpTUN7+kaeYRx6SQK/Jo jRp3c0XuWoLx21QQgE2bHORImVOBdizl2/7w9j9iPZWZEAdH3putAwSTjNWNKbVV0Ywl KKEGVEuQGhsRjOqpnsg87o4ZrL32kctRMpzwnWMnn5IyZP/XTx22mNm9d/AuwkKaVieF jjrg== X-Gm-Message-State: AOJu0YwomNUo5HtLBnI/saVgnTdMyR4Otra0Hu9b4xQQGqrtPZiwZP31 fqJ0o4Yt1CcwxArjEivLqfWW/0idsSKoe7guE063JzyBCPA= X-Google-Smtp-Source: AGHT+IFgfgrOm4j+CjzxxszKtgDY7QBqQPPYiD4sy96QnDcwrRKUtjwD6xQw0S+4Qab0FirQp4nrKO9PH07n/PFHVYY= X-Received: by 2002:a05:6870:8901:b0:1c0:fc08:8f91 with SMTP id i1-20020a056870890100b001c0fc088f91mr8326749oao.40.1694316739767; Sat, 09 Sep 2023 20:32:19 -0700 (PDT) MIME-Version: 1.0 From: Andy Tai <atai@HIDDEN> Date: Sat, 9 Sep 2023 20:31:00 -0700 Message-ID: <CAJsg1E_4GhMMqhAmkPcY+qwmPv8pukJJUSRu_pj0-8jqdQsgjA@HIDDEN> Subject: [PATCH] gnu: xpra: Update to 5.0.1 To: guix-patches@HIDDEN Content-Type: multipart/mixed; boundary="0000000000006987700604f8dbcd" Received-SPF: pass client-ip=2607:f8b0:4864:20::c33; envelope-from=lichengtai@HIDDEN; helo=mail-oo1-xc33.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From 9d1118eab79d4fe7fa20490209780dbd88c9fbb0 Mon Sep 17 00:00:00 2001 Message-Id: <9d1118eab79d4fe7fa20490209780dbd88c9fbb0.1694305735.git.ltai@HIDDEN> From: Andy Tai <ltai@HIDDEN> Date: Sat, 9 S [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.5 (/) --0000000000006987700604f8dbcd Content-Type: text/plain; charset="UTF-8" --0000000000006987700604f8dbcd Content-Type: text/x-patch; charset="US-ASCII"; name="0001-gnu-xpra-Update-to-5.0.1.patch" Content-Disposition: attachment; filename="0001-gnu-xpra-Update-to-5.0.1.patch" Content-Transfer-Encoding: base64 Content-ID: <f_lmcpypws0> X-Attachment-Id: f_lmcpypws0 RnJvbSA5ZDExMThlYWI3OWQ0ZmU3ZmEyMDQ5MDIwOTc4MGRiZDg4YzlmYmIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8OWQxMTE4ZWFiNzlkNGZlN2ZhMjA0OTAyMDk3ODBk YmQ4OGM5ZmJiMC4xNjk0MzA1NzM1LmdpdC5sdGFpQHJva3UuY29tPgpGcm9tOiBBbmR5IFRhaSA8 bHRhaUByb2t1LmNvbT4KRGF0ZTogU2F0LCA5IFNlcCAyMDIzIDE3OjI2OjM5IC0wNzAwClN1Ympl Y3Q6IFtQQVRDSF0gZ251OiB4cHJhOiBVcGRhdGUgdG8gNS4wLjEKVG86IGd1aXgtcGF0Y2hlc0Bn bnUub3JnCgoqIGdudS9wYWNrYWdlcy94b3JnLnNjbSAoeHByYSk6IFVwZGF0ZSB0byA1LjAuMS4K W2lucHV0c106IEFkZCBjdXBzLgoqIGdudS9wYWNrYWdlcy9wYXRjaGVzL3hwcmEtNS4wLWluc3Rh bGxfbGlicy5wYXRjaDogTmV3IGZpbGUuCiogZ251L3BhY2thZ2VzL3BhdGNoZXMveHByYS01LjAt c3lzdGVtZC1ydW4ucGF0Y2g6IE5ldyBmaWxlLgoqIGdudS9wYWNrYWdlcy9wYXRjaGVzL3hwcmEt NC4yLWluc3RhbGxfbGlicy5wYXRjaDogUmVtb3ZlZC4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy94 cHJhLTQuMi1zeXN0ZW1kLXJ1bi5wYXRjaDogUmVtb3ZlZC4KLS0tCiAuLi5saWJzLnBhdGNoID0+ IHhwcmEtNS4wLWluc3RhbGxfbGlicy5wYXRjaH0gfCAzMiArKysrKysrKysrKystLS0tLS0tCiAu Li5kLXJ1bi5wYXRjaCA9PiB4cHJhLTUuMC1zeXN0ZW1kLXJ1bi5wYXRjaH0gfCAzMSArKysrKysr KystLS0tLS0tLS0KIGdudS9wYWNrYWdlcy94b3JnLnNjbSAgICAgICAgICAgICAgICAgICAgICAg ICB8IDE0ICsrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDM0IGRl bGV0aW9ucygtKQogcmVuYW1lIGdudS9wYWNrYWdlcy9wYXRjaGVzL3t4cHJhLTQuMi1pbnN0YWxs X2xpYnMucGF0Y2ggPT4geHByYS01LjAtaW5zdGFsbF9saWJzLnBhdGNofSAoNTIlKQogcmVuYW1l IGdudS9wYWNrYWdlcy9wYXRjaGVzL3t4cHJhLTQuMi1zeXN0ZW1kLXJ1bi5wYXRjaCA9PiB4cHJh LTUuMC1zeXN0ZW1kLXJ1bi5wYXRjaH0gKDY2JSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMv cGF0Y2hlcy94cHJhLTQuMi1pbnN0YWxsX2xpYnMucGF0Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hl cy94cHJhLTUuMC1pbnN0YWxsX2xpYnMucGF0Y2gKc2ltaWxhcml0eSBpbmRleCA1MiUKcmVuYW1l IGZyb20gZ251L3BhY2thZ2VzL3BhdGNoZXMveHByYS00LjItaW5zdGFsbF9saWJzLnBhdGNoCnJl bmFtZSB0byBnbnUvcGFja2FnZXMvcGF0Y2hlcy94cHJhLTUuMC1pbnN0YWxsX2xpYnMucGF0Y2gK aW5kZXggNjVkNDg5YTNiOC4uZmQ1Mzk0ZDkzMSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3Bh dGNoZXMveHByYS00LjItaW5zdGFsbF9saWJzLnBhdGNoCisrKyBiL2dudS9wYWNrYWdlcy9wYXRj aGVzL3hwcmEtNS4wLWluc3RhbGxfbGlicy5wYXRjaApAQCAtMSwxOCArMSwyNyBAQAotVGhpcyB3 b3JrYXJvdW5kIGZvciBHZW50b28gaW50ZXJmZXJlcyB3aXRoIG91ciB1c2Ugb2YgLS1uby1jb21w aWxlIGR1cmluZwotdGhlICdpbnN0YWxsIHN0YWdlLgotCi0tLS0gYS9zZXR1cC5weQkyMDIyLTAx LTA0IDEwOjEwOjA1LjAzOTgyNTAwMCArMDEwMAotKysrIGIvc2V0dXAucHkJMjAyMi0wMS0wNiAx NToxMDozMS45NTI2NTYwMzkgKzAxMDAKLUBAIC01ODksOCArNTg5LDYgQEAKLSAgICAgICAgIH0p CitkaWZmIC0tZ2l0IGEvc2V0dXAucHkgYi9zZXR1cC5weQoraW5kZXggZTI1NGJmOTljLi45MGRi NTVjM2YgMTAwNzU1CistLS0gYS9zZXR1cC5weQorKysrIGIvc2V0dXAucHkKK0BAIC02NjMsOCAr NjYzLDYgQEAgaWYgbW9kdWxlc19FTkFCTEVEOgorICMgVXRpbGl0eSBtZXRob2RzIGZvciBidWls ZGluZyB3aXRoIEN5dGhvbgogIAogIGRlZiBhZGRfY3l0aG9uX2V4dCgqYXJncywgKiprd2FyZ3Mp OgogLSAgICBpZiAiLS1uby1jb21waWxlIiBpbiBzeXMuYXJndiBhbmQgbm90ICgiYnVpbGQiIGlu IHN5cy5hcmd2IGFuZCAiaW5zdGFsbCIgaW4gc3lzLmFyZ3YpOgogLSAgICAgICAgcmV0dXJuCi0g ICAgIGFzc2VydCBjeXRob25fRU5BQkxFRCwgImN5dGhvbiBjb21waWxhdGlvbiBpcyBkaXNhYmxl ZCIKKyAgICAgaWYgbm90IGN5dGhvbl9FTkFCTEVEOgorICAgICAgICAgcmFpc2UgVmFsdWVFcnJv cihmImNhbm5vdCBidWlsZCB7YXJnc306IGN5dGhvbiBjb21waWxhdGlvbiBpcyBkaXNhYmxlZCIp CiAgICAgIGlmIGN5dGhvbl90cmFjaW5nX0VOQUJMRUQ6Ci0gICAgICAgICBrd2FyZ3NbImRlZmlu ZV9tYWNyb3MiXSA9IFsKLUBAIC0xNzAzLDE0ICsxNzAxLDYgQEAKK0BAIC0xODA5LDkgKzE4MDcs NiBAQCBlbHNlOgorICAgICAgICAgICAgIGlmIHJvb3RfcHJlZml4LmVuZHN3aXRoKCIvdXNyIik6 CisgICAgICAgICAgICAgICAgICNpZTogIi8iIG9yICIvdXNyL3NyYy9ycG1idWlsZC9CVUlMRFJP T1QveHByYS0wLjE4LjAtMC4yMDE2MDUxM3IxMjU3My5mYzIzLng4Nl82NC8iCisgICAgICAgICAg ICAgICAgIHJvb3RfcHJlZml4ID0gcm9vdF9wcmVmaXhbOi00XQorLSAgICAgICAgICAgIGZvciB4 IGluIHN5cy5hcmd2OgorLSAgICAgICAgICAgICAgICBpZiB4LnN0YXJ0c3dpdGgoIi0tcm9vdD0i KToKKy0gICAgICAgICAgICAgICAgICAgIHJvb3RfcHJlZml4ID0geFtsZW4oIi0tcm9vdD0iKTpd CisgICAgICAgICAgICAgcHJpbnQoZiJpbnN0YWxsX2RhdGFfb3ZlcnJpZGUucnVuKCkgcm9vdF9w cmVmaXg9e3Jvb3RfcHJlZml4fSIpCisgICAgICAgICAgICAgYnVpbGRfeHByYV9jb25mKHJvb3Rf cHJlZml4KQorIAorQEAgLTE5NTUsMTMgKzE5NTAsNiBAQCBlbHNlOgogICAgICAgICAgICAgIGlm IHVpbnB1dF9FTkFCTEVEOgogICAgICAgICAgICAgICAgICBhZGRfZGF0YV9maWxlcygibGliL3Vk ZXYvcnVsZXMuZC8iLCBbImZzL2xpYi91ZGV2L3J1bGVzLmQvNzEteHByYS12aXJ0dWFsLXBvaW50 ZXIucnVsZXMiXSkKICAKQEAgLTIzLDcgKzMyLDYgQEAgdGhlICdpbnN0YWxsIHN0YWdlLgogLSAg ICAjb3RoZXJ3aXNlIHdlIHVzZSB0aGUgZmxhZ3MgdG8gc2tpcCBwa2djb25maWcKIC0gICAgaWYg KCItLW5vLWNvbXBpbGUiIGluIHN5cy5hcmd2IG9yICItLXNraXAtYnVpbGQiIGluIHN5cy5hcmd2 KSBhbmQgbm90ICgiYnVpbGQiIGluIHN5cy5hcmd2IGFuZCAiaW5zdGFsbCIgaW4gc3lzLmFyZ3Yp OgogLSAgICAgICAgcGtnY29uZmlnID0gbm9fcGtnY29uZmlnCi0tCisgCiAgICAgIGlmIE9TWCBh bmQgInB5MmFwcCIgaW4gc3lzLmFyZ3Y6CiAgICAgICAgICBpbXBvcnQgcHkyYXBwICAgICNAVW5y ZXNvbHZlZEltcG9ydAotICAgICAgICAgYXNzZXJ0IHB5MmFwcCBpcyBub3QgTm9uZQpkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMveHByYS00LjItc3lzdGVtZC1ydW4ucGF0Y2ggYi9n bnUvcGFja2FnZXMvcGF0Y2hlcy94cHJhLTUuMC1zeXN0ZW1kLXJ1bi5wYXRjaApzaW1pbGFyaXR5 IGluZGV4IDY2JQpyZW5hbWUgZnJvbSBnbnUvcGFja2FnZXMvcGF0Y2hlcy94cHJhLTQuMi1zeXN0 ZW1kLXJ1bi5wYXRjaApyZW5hbWUgdG8gZ251L3BhY2thZ2VzL3BhdGNoZXMveHByYS01LjAtc3lz dGVtZC1ydW4ucGF0Y2gKaW5kZXggOGRmZDljODJmMC4uNDM0M2IyZThjMSAxMDA2NDQKLS0tIGEv Z251L3BhY2thZ2VzL3BhdGNoZXMveHByYS00LjItc3lzdGVtZC1ydW4ucGF0Y2gKKysrIGIvZ251 L3BhY2thZ2VzL3BhdGNoZXMveHByYS01LjAtc3lzdGVtZC1ydW4ucGF0Y2gKQEAgLTEsMTMgKzEs MTIgQEAKLURpc2FibGUgc3lzdGVtZC1ydW4gaWYgdGhlIGNvbW1hbmQgaXMgbm90IGZvdW5kLgot Ci1kaWZmIC1ydSB4cHJhLTQuMn4veHByYS9zY3JpcHRzL21haW4ucHkgeHByYS00LjIveHByYS9z Y3JpcHRzL21haW4ucHkKLS0tLSB4cHJhLTQuMn4veHByYS9zY3JpcHRzL21haW4ucHkJMjAyMS0w Ni0wNiAwODo1MToxMy43NTY4MTU4NDIgLTA3MDAKLSsrKyB4cHJhLTQuMi94cHJhL3NjcmlwdHMv bWFpbi5weQkyMDIxLTA2LTA2IDE2OjA3OjEzLjM3MTAyNDQ4NiAtMDcwMAotQEAgLTMzMSwyMyAr MzMxLDI2IEBACi0gICAgIGlmIG5vdCBpc19zeXN0ZW1kX3BpZDEoKToKLSAgICAgICAgIHJldHVy biBGYWxzZSAgICAjIHByYWdtYTogbm8gY292ZXIKLSAgICAgI3Rlc3QgaXQ6Ci0tICAgIGNtZCA9 IFsic3lzdGVtZC1ydW4iLCAiLS1xdWlldCIsICItLXVzZXIiLCAiLS1zY29wZSIsICItLSIsICJ0 cnVlIl0KK2RpZmYgLS1naXQgYS94cHJhL3NjcmlwdHMvbWFpbi5weSBiL3hwcmEvc2NyaXB0cy9t YWluLnB5CitpbmRleCAzODEzMzMxYTUuLjQ2ZTJjODNhNiAxMDA3NTUKKy0tLSBhL3hwcmEvc2Ny aXB0cy9tYWluLnB5CisrKysgYi94cHJhL3NjcmlwdHMvbWFpbi5weQorQEAgLTMzNywyMyArMzM3 LDI2IEBAIGRlZiB1c2Vfc3lzdGVtZF9ydW4ocykgLT4gYm9vbDoKKyAgICAgY21kID0gWyJzeXN0 ZW1kLXJ1biIsICItLXF1aWV0Il0KKyAgICAgaWYgZ2V0dWlkKCkhPTA6CisgICAgICAgICBjbWQg Kz0gWyItLXVzZXIiXQorLSAgICBjbWQgKz0gWyItLXNjb3BlIiwgIi0tIiwgInRydWUiXQogLSAg ICBwcm9jID0gUG9wZW4oY21kLCBzdGRvdXQ9UElQRSwgc3RkZXJyPVBJUEUsIHNoZWxsPUZhbHNl KQogICAgICB0cnk6CiAtICAgICAgICBwcm9jLmNvbW11bmljYXRlKHRpbWVvdXQ9MikKQEAgLTE1 LDEzICsxNCwxMyBAQCBkaWZmIC1ydSB4cHJhLTQuMn4veHByYS9zY3JpcHRzL21haW4ucHkgeHBy YS00LjIveHByYS9zY3JpcHRzL21haW4ucHkKIC0gICAgZXhjZXB0IFRpbWVvdXRFeHBpcmVkOiAg IyBwcmFnbWE6IG5vIGNvdmVyCiAtICAgICAgICByID0gTm9uZQogLSAgICBpZiByIGlzIE5vbmU6 Ci0rICAgICAgICBjbWQgPSBbInN5c3RlbWQtcnVuIiwgIi0tcXVpZXQiLCAiLS11c2VyIiwgIi0t c2NvcGUiLCAiLS0iLCAidHJ1ZSJdCi0rICAgICAgICBwcm9jID0gUG9wZW4oY21kLCBzdGRvdXQ9 UElQRSwgc3RkZXJyPVBJUEUsIHNoZWxsPUZhbHNlKQotICAgICAgICAgdHJ5OgorLSAgICAgICAg dHJ5OgogLSAgICAgICAgICAgIHByb2MudGVybWluYXRlKCkKIC0gICAgICAgIGV4Y2VwdCBFeGNl cHRpb246CiAtICAgICAgICAgICAgcGFzcwotLSAgICAgICAgdHJ5OgorKyAgICAgICAgY21kID0g WyJzeXN0ZW1kLXJ1biIsICItLXF1aWV0IiwgIi0tdXNlciIsICItLXNjb3BlIiwgIi0tIiwgInRy dWUiXQorKyAgICAgICAgcHJvYyA9IFBvcGVuKGNtZCwgc3Rkb3V0PVBJUEUsIHN0ZGVycj1QSVBF LCBzaGVsbD1GYWxzZSkKKyAgICAgICAgIHRyeToKIC0gICAgICAgICAgICBwcm9jLmNvbW11bmlj YXRlKHRpbWVvdXQ9MSkKICsgICAgICAgICAgICBwcm9jLmNvbW11bmljYXRlKHRpbWVvdXQ9MikK ICsgICAgICAgICAgICByID0gcHJvYy5yZXR1cm5jb2RlCkBAIC00MSw1ICs0MCw1IEBAIGRpZmYg LXJ1IHhwcmEtNC4yfi94cHJhL3NjcmlwdHMvbWFpbi5weSB4cHJhLTQuMi94cHJhL3NjcmlwdHMv bWFpbi5weQogKyAgICBleGNlcHQgRmlsZU5vdEZvdW5kRXJyb3I6CiArICAgICAgICByZXR1cm4g RmFsc2UKICAKLSAKLSBkZWYgcnVuX21vZGUoc2NyaXB0X2ZpbGUsIGVycm9yX2NiLCBvcHRpb25z LCBhcmdzLCBtb2RlLCBkZWZhdWx0cyk6CisgZGVmIHZlcmlmeV9naXIoKToKKyAgICAgdHJ5Ogpk aWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3hvcmcuc2NtIGIvZ251L3BhY2thZ2VzL3hvcmcuc2Nt CmluZGV4IDA4Y2JkOGQ3NTcuLjY3ZTA0NmY1MDcgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy94 b3JnLnNjbQorKysgYi9nbnUvcGFja2FnZXMveG9yZy5zY20KQEAgLTcyLDYgKzcyLDcgQEAgKGRl ZmluZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4b3JnKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBiYXNoKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBiaXNvbikKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgY2hlY2spCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz IGN1cHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNvbXByZXNzaW9uKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBlbWFjcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgZmxleCkKQEAgLTYxMTAsMTYgKzYxMTEsMTYgQEAgKGRlZmluZS1wdWJsaWMgeGNvbXBtZ3IK IChkZWZpbmUtcHVibGljIHhwcmEKICAgKHBhY2thZ2UKICAgICAobmFtZSAieHByYSIpCi0gICAg KHZlcnNpb24gIjQuNC42IikKKyAgICAodmVyc2lvbiAiNS4wLjEiKQogICAgIChzb3VyY2UKICAg ICAgKG9yaWdpbgogICAgICAgIChtZXRob2QgdXJsLWZldGNoKQogICAgICAgICh1cmkgKHN0cmlu Zy1hcHBlbmQgImh0dHBzOi8vd3d3LnhwcmEub3JnL3NyYy94cHJhLSIKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAoc2hhMjU2Ci0gICAgICAg IChiYXNlMzIgIjBkM3MxM3dxYm45andxcDRpNTVtbjRjaGdqa3Jja3Ezang0anJxMWJjamp6NWFn emZycTUiKSkKLSAgICAgICAocGF0Y2hlcyAoc2VhcmNoLXBhdGNoZXMgInhwcmEtNC4yLXN5c3Rl bWQtcnVuLnBhdGNoIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAieHByYS00LjIt aW5zdGFsbF9saWJzLnBhdGNoIikpKSkKKyAgICAgICAgKGJhc2UzMiAiMDNtbnk1NTE2ZzZpY3pw NmNnYmxscGwwcTJiejM4bmgyejdzMzZxanJsa2ZtOXhjNjhjbCIpKQorICAgICAgIChwYXRjaGVz IChzZWFyY2gtcGF0Y2hlcyAieHByYS01LjAtc3lzdGVtZC1ydW4ucGF0Y2giCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJ4cHJhLTUuMC1pbnN0YWxsX2xpYnMucGF0Y2giKSkpKQog ICAgIChidWlsZC1zeXN0ZW0gcHl0aG9uLWJ1aWxkLXN5c3RlbSkKICAgICAoaW5wdXRzCiAgICAg IChsaXN0IGJhc2gtbWluaW1hbCAgICAgICAgICAgICAgICAgOyBmb3Igd3JhcC1wcm9ncmFtCkBA IC02MTU4LDcgKzYxNTksOCBAQCAoZGVmaW5lLXB1YmxpYyB4cHJhCiAgICAgICAgICAgIHB5dGhv bi1kYnVzICAgICAgICAgICAgICAgICAgOyBGb3IgZGVza3RvcCBub3RpZmljYXRpb25zLgogICAg ICAgICAgICBkYnVzICAgICAgICAgICAgICAgICAgICAgICAgIDsgRm9yIGRidXMtbGF1bmNoIGNv bW1hbmQuCiAgICAgICAgICAgIHB5dGhvbi1sejQgICAgICAgICAgICAgICAgICAgOyBGYXN0ZXIg Y29tcHJlc3Npb24gdGhhbiB6bGliLgotICAgICAgICAgICBweXRob24tbmV0aWZhY2VzKSkKKyAg ICAgICAgICAgcHl0aG9uLW5ldGlmYWNlcworICAgICAgICAgICBweXRob24tcHljdXBzKSkKICAg ICAobmF0aXZlLWlucHV0cyAobGlzdCBwa2ctY29uZmlnIHBhbmRvYyBweXRob24tY3l0aG9uKSkK ICAgICAoYXJndW1lbnRzCiAgICAgIChsaXN0CkBAIC02MTkzLDcgKzYxOTUsNyBAQCAoZGVmaW5l LXB1YmxpYyB4cHJhCiAgICAgICAgICAgICAgICAgIChmb3JtYXQgI2YgIn5zIiAoc2VhcmNoLWlu cHV0LWZpbGUgaW5wdXRzICJiaW4veGF1dGgiKSkpKQogICAgICAgICAgICAgICA7OyBGaXggZGly ZWN0b3J5IG9mIGNvbmZpZyBmaWxlcy4KICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICcoInhw cmEvc2NyaXB0cy9jb25maWcucHkiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ4cHJh L3BsYXRmb3JtL3hwb3NpeC9wYXRocy5weSIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJ4cHJhL3BsYXRmb3JtL3Bvc2l4L3BhdGhzLnB5IikKICAgICAgICAgICAgICAgICAoKCJcIi9l dGMveHByYS8/XCIiKQogICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiXCIiICMkb3V0 cHV0ICIvZXRjL3hwcmEvXCIiKSkpCiAgICAgICAgICAgICAgIDs7IFhYWDogU3RvbGVuIGZyb20g KGdudSBwYWNrYWdlcyBsaW51eCkKCmJhc2UtY29tbWl0OiA1ZGI3OGU3YzFiMDZkMWI0ODkyYmRi M2UxNTNiOTViMjE1NzcyNzFlCi0tIAoyLjQwLjEKCg== --0000000000006987700604f8dbcd--
Andy Tai <atai@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#65849; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.