From unknown Fri Jun 20 20:12:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70881 <70881@debbugs.gnu.org> To: bug#70881 <70881@debbugs.gnu.org> Subject: Status: [PATCH] gnu: xpra: Update to 6.0. Reply-To: bug#70881 <70881@debbugs.gnu.org> Date: Sat, 21 Jun 2025 03:12:29 +0000 retitle 70881 [PATCH] gnu: xpra: Update to 6.0. reassign 70881 guix-patches submitter 70881 Andy Tai severity 70881 normal tag 70881 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 11 14:16:01 2024 Received: (at submit) by debbugs.gnu.org; 11 May 2024 18:16:01 +0000 Received: from localhost ([127.0.0.1]:49805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5rGK-0004ay-CB for submit@debbugs.gnu.org; Sat, 11 May 2024 14:16:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:59680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5rGI-0004as-5Q for submit@debbugs.gnu.org; Sat, 11 May 2024 14:15:58 -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 ) id 1s5rGH-0005ZM-IA for guix-patches@gnu.org; Sat, 11 May 2024 14:15:57 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5rGB-0003GK-Gf for guix-patches@gnu.org; Sat, 11 May 2024 14:15:57 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6f44d2b3130so2708576b3a.2 for ; Sat, 11 May 2024 11:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715451349; x=1716056149; darn=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=K6yqVAfaB9ibneQ3LQzKkbeUQs67BnYGVKMHt93sdhw=; b=ca39mzdaF69AQFUtB/s8rWvBxAHbuUBHiygGdo49Zq88wXcWICUSNQRbYVP1PdCezz UBrujAZs5x3PfPSeRB3kEHMQYjqT1U/ZHsV4os6R1OvTm0XRJIAwRzPfY2FssdUxd9On 0laOICy20Z1Hwh3Li6XSCjcxgD7+faEPXuHliKMs9hQgF+rc8Gw8ZhojJaVmp9bl3/Q7 mpTTpM0rtSKhOBsFTR8/p9XMiUQr2MlRI6YsACuhers8izCyzwcWarTK5k8R+saqjLI5 Fdb7gqWm1hh3YzTJXRhQVF9u1R25gfM2dH/d0MyN9Xz0fG3V3Ct2+cpkQ0OO4j4iQz+g aVIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715451349; x=1716056149; 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=K6yqVAfaB9ibneQ3LQzKkbeUQs67BnYGVKMHt93sdhw=; b=Ir9Lg+bBmvnovTRxLaLhRmoZ7AtT0YaHQ0qt6L1IT2PxFHJJx7mAh+iZHPYxA+TKep VcsqKqkd5CMRFTSoro+vxxLZp3keZdL/zsTncVJuh0P/LmISFW3TFHdyoL97gUWW9oAJ qnGRAbpwmzNRHp9igPyXFfjIJ4V2ae2JHFUNhoEIlUpIxhZq0/58zzeJlCD6+u6cm3JF xg8B+J8l9CMAh2a+WI1Ku7Ja+vN8TfHrBTOrv5XCr2pMIJa9vjo94VRI4SMza8S7wqaX 1Y1xgymxGRBU6/oi67OZ+U/S9x1C7Hf8HOMOCbbS7WguJS1KdOpHIBtqf764881zGT6k IHDw== X-Gm-Message-State: AOJu0Yw8/seezOPKlb1EcknDJ0Ee03BAESkCQfXvQR3UDex51oQ90L2K ebwGmjlU72O7nJfDKFgXo57azYNp2OPITTwEHRPTXKZmU7WIigqw+cL24Q== X-Google-Smtp-Source: AGHT+IFZcsZg2WGEpnze78ss6wvjuQWsapVXYFZ/QiR5wTLzAs9P9mSEs/0+M4e4RkoArmmNSuV11w== X-Received: by 2002:a05:6a00:b87:b0:6ee:1c9d:b471 with SMTP id d2e1a72fcca58-6f4e0356ee7mr6829228b3a.25.1715451348898; Sat, 11 May 2024 11:15:48 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2b2de1csm4937383b3a.204.2024.05.11.11.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 11:15:48 -0700 (PDT) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] gnu: xpra: Update to 6.0. Date: Sat, 11 May 2024 11:15:46 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=lichengtai@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, 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.1 (-) X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * gnu/packages/xorg.scm (xpra): Update to 6.0. [inputs]: Add xxhash. [native-inputs]: Change python-cython to python-cython-3. * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc --- ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- gnu/packages/xorg.scm | 12 ++++---- 3 files changed, 28 insertions(+), 26 deletions(-) rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) diff --git a/gnu/packages/patches/xpra-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch similarity index 67% rename from gnu/packages/patches/xpra-5.0-install_libs.patch rename to gnu/packages/patches/xpra-6.0-install_libs.patch index 4d40bf1f79..c608b519f4 100644 --- a/gnu/packages/patches/xpra-5.0-install_libs.patch +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch @@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during the 'install stage. diff --git a/setup.py b/setup.py -index e254bf99c..90db55c3f 100755 +index 4f066fa8bf..14a9ed65ed 100755 --- a/setup.py +++ b/setup.py -@@ -663,8 +663,6 @@ if modules_ENABLED: +@@ -760,8 +760,6 @@ if modules_ENABLED: # Utility methods for building with Cython - - def add_cython_ext(*args, **kwargs): + + def do_add_cython_ext(*args, **kwargs): - if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): - return if not cython_ENABLED: raise ValueError(f"cannot build {args}: cython compilation is disabled") if cython_tracing_ENABLED: -@@ -1809,9 +1807,6 @@ else: +@@ -1971,9 +1969,6 @@ else: if root_prefix.endswith("/usr"): - #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" + # 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}") + print(f" root_prefix={root_prefix!r}") build_xpra_conf(root_prefix) - -@@ -1955,13 +1950,6 @@ else: + +@@ -2116,13 +2111,6 @@ else: if uinput_ENABLED: add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) - -- #gentoo does weird things, calls --no-compile with build *and* install -- #then expects to find the cython modules!? ie: + +- # gentoo does weird things, calls --no-compile with build *and* install +- # then expects to find the cython modules!? ie: - #> python2.7 setup.py build -b build-2.7 install --no-compile \ - # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 -- #otherwise we use the flags to skip pkgconfig -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): +- # otherwise we use the flags to skip pkgconfig +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 - pkgconfig = no_pkgconfig - + if OSX and "py2app" in sys.argv: import py2app #@UnresolvedImport diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch similarity index 90% rename from gnu/packages/patches/xpra-5.0-systemd-run.patch rename to gnu/packages/patches/xpra-6.0-systemd-run.patch index 437a8cc37f..2d60c29423 100644 --- a/gnu/packages/patches/xpra-5.0-systemd-run.patch +++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch @@ -3,12 +3,12 @@ Distriction specific patch, not going upstream Disable systemd-run if the command is not found. diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 3813331a5..46e2c83a6 100755 +index 1c5e8ddaad..084aabe792 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool: +@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: cmd = ["systemd-run", "--quiet"] - if getuid()!=0: + if getuid() != 0: cmd += ["--user"] - cmd += ["--scope", "--", "true"] - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) @@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755 + r = proc.returncode except TimeoutExpired: # pragma: no cover r = None -- return r==0 +- return r == 0 + if r is None: + try: + proc.terminate() @@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755 + return r==0 + except FileNotFoundError: + return False - + + def verify_gir(): - try: diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 74059a2691..1f1fe4d7c6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -76,6 +76,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages check) #:use-module (gnu packages cups) #:use-module (gnu packages compression) + #:use-module (gnu packages digest) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) @@ -6157,16 +6158,16 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "5.0.8") + (version "6.0") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) - (patches (search-patches "xpra-5.0-systemd-run.patch" - "xpra-5.0-install_libs.patch")))) + (base32 "1dh89k2whvim4lgnryr9hisdq2zzcc5md9c3vm49y6jsp4j77glq")) + (patches (search-patches "xpra-6.0-systemd-run.patch" + "xpra-6.0-install_libs.patch")))) (build-system python-build-system) (inputs (list bash-minimal ; for wrap-program @@ -6192,6 +6193,7 @@ (define-public xpra xf86-video-dummy xf86-input-mouse xf86-input-keyboard + xxhash python-pillow ;; Optional dependencies. libx264 @@ -6207,7 +6209,7 @@ (define-public xpra python-lz4 ; Faster compression than zlib. python-netifaces python-pycups)) - (native-inputs (list pkg-config pandoc python-cython)) + (native-inputs (list pkg-config pandoc python-cython-3)) (arguments (list #:configure-flags #~(list "--without-Xdummy" base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5 -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Sun May 12 17:28:39 2024 Received: (at 70881) by debbugs.gnu.org; 12 May 2024 21:28:39 +0000 Received: from localhost ([127.0.0.1]:56585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6GkJ-0001R2-D5 for submit@debbugs.gnu.org; Sun, 12 May 2024 17:28:39 -0400 Received: from mail-yb1-f175.google.com ([209.85.219.175]:58848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6GkG-0001Qt-Dt for 70881@debbugs.gnu.org; Sun, 12 May 2024 17:28:37 -0400 Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-debaa161ae3so4200083276.1 for <70881@debbugs.gnu.org>; Sun, 12 May 2024 14:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1715549250; x=1716154050; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=whhZywBIECR97QpD7SL4Hyp8GoAAIRvrSFOjTzy8iMY=; b=eKV2uo54mlTOho2FHOyrh89v0APAzKd0UpxKV1UZA7h90AGkswxA0l/OZZM128q5Eg 7H3kCvsVmKVwhbULvbxvKGu1X9QqP5zac8WItkbYqAv8LdyywKaujnaFmIa5VjjG5X74 V0Kxzjb3ZHCOdGDfIoghZXzMQrpZjfLWfOcOQ7ohLy+uoGEoIvMrAdJXDbtKg42xXpwT AfHFoNJrBdqt5wGiEcubSEhRCaz0WZPfxXHldxbtc92GdpJwOfVoTp5LYSYDf2KBhvee XphGKfAjDapHj+96vsNs4Qb0maEDJe1MdgxvEA451zx7paU5ZtGlHXLhezqjJbCWdj4h zWZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715549250; x=1716154050; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=whhZywBIECR97QpD7SL4Hyp8GoAAIRvrSFOjTzy8iMY=; b=j8QlSkZROkZObapJ7P3dPRUpyb88wrO+wQZLVKkOSZsJxExuGO1qrds4WV3HOywzOI rwzYlQA1hG1E1AS4ZsJXLfhy9Wx6ChgB+tWM5y5ZJbETnLgWbFwS/nwB7YJES9UE3VJU NeHYkZdO1qK5JjimtuEDxGeJe3zYn86ODnf70oMjP2phWCfN02CYdkptCojV9ossqR1g 45eejXzYI8zJaLjl9LX1NgKSc1pf7uM9nL5E6sx5ibYLvWfyHToFU0WwVCkL3vhBr3+a E/gw09e9YHigeJYNyRsB7dYFXP/saY92pph42ys8Gp4NII/HxvN9nCx8wSvsTO1m61Cw L6JQ== X-Gm-Message-State: AOJu0Yz3Qa+tfiNgeoPaoHGFjXRWuRyf8ntPf/I78OAc6si/Jt46ZY1r QFK08S1m2KOIuh4Jk8oXDVwqE/XEPTQZzUq/kikP31niRKIawgaNiHisOSPq5q3jWa/5LuBweGa 4xcVmXzvrKlOaqtB9v68O8OpigSmgKSKn X-Google-Smtp-Source: AGHT+IGoallTz0WUej8UmsiwalmDEdOSWE1O19n5IWJY2Cw2LmySqY8Xs0ANJ81t8hbwfkykjJaSacJDjM+diRfdC7c= X-Received: by 2002:a25:684c:0:b0:de6:17aa:e711 with SMTP id 3f1490d57ef6-dee4f31737emr11250130276.7.1715549249753; Sun, 12 May 2024 14:27:29 -0700 (PDT) MIME-Version: 1.0 From: Andy Tai Date: Sun, 12 May 2024 14:26:53 -0700 Message-ID: Subject: To: 70881@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 2.3 (++) 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: patch passes QA https://qa.guix.gnu.org/issue/70881 Content analysis details: (2.3 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.219.175 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.219.175 listed in list.dnswl.org] 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 BLANK_SUBJECT Subject is present but empty 0.0 BODY_SINGLE_URI Message body is only a URI X-Debbugs-Envelope-To: 70881 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.3 (+) 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: patch passes QA https://qa.guix.gnu.org/issue/70881 Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.219.175 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.219.175 listed in list.dnswl.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 BLANK_SUBJECT Subject is present but empty -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager patch passes QA https://qa.guix.gnu.org/issue/70881 From debbugs-submit-bounces@debbugs.gnu.org Mon May 13 03:17:56 2024 Received: (at 70881) by debbugs.gnu.org; 13 May 2024 07:17:56 +0000 Received: from localhost ([127.0.0.1]:59020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6PwZ-0006GU-Gq for submit@debbugs.gnu.org; Mon, 13 May 2024 03:17:56 -0400 Received: from 6.mo583.mail-out.ovh.net ([178.32.119.138]:48349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6PwV-0006GK-7N for 70881@debbugs.gnu.org; Mon, 13 May 2024 03:17:54 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.96]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Vd9ms3WHPz1CKf for <70881@debbugs.gnu.org>; Mon, 13 May 2024 07:17:49 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-h92qk (unknown [10.108.54.28]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E70471FEB3; Mon, 13 May 2024 07:17:48 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-h92qk with ESMTPSA id gmuQKpy+QWbWDgAAkNXzhA (envelope-from ); Mon, 13 May 2024 07:17:48 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0013ea895e5-bcec-4a5f-a57f-54250e74e3b4, AFD3D7969371CC029319C969337B9752385513BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.128.58 From: Nicolas Graves To: Andy Tai , 70881@debbugs.gnu.org Subject: Re: [bug#70881] [PATCH] gnu: xpra: Update to 6.0. In-Reply-To: References: Date: Mon, 13 May 2024 09:17:43 +0200 Message-ID: <87r0e6b2p4.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 13735134442660684498 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegfedgudduiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefvefgueeiheevjeduleelveduueetvdeggfduheevudehtddutdefkedugedvffenucffohhmrghinhepgihprhgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdektddrvddugedruddvkedrheekpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeekudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70881 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2024-05-11 11:15, Andy Tai wrote: > * gnu/packages/xorg.scm (xpra): Update to 6.0. > [inputs]: Add xxhash. > [native-inputs]: Change python-cython to python-cython-3. > * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. > * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. > * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. > * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. Hi Andy, Please also don't forget to replace the patches in gnu/local.mk. Thanks! Nicolas > > Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc > --- > ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- > ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- > gnu/packages/xorg.scm | 12 ++++---- > 3 files changed, 28 insertions(+), 26 deletions(-) > rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) > rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) > > diff --git a/gnu/packages/patches/xpra-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch > similarity index 67% > rename from gnu/packages/patches/xpra-5.0-install_libs.patch > rename to gnu/packages/patches/xpra-6.0-install_libs.patch > index 4d40bf1f79..c608b519f4 100644 > --- a/gnu/packages/patches/xpra-5.0-install_libs.patch > +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch > @@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during > the 'install stage. > > diff --git a/setup.py b/setup.py > -index e254bf99c..90db55c3f 100755 > +index 4f066fa8bf..14a9ed65ed 100755 > --- a/setup.py > +++ b/setup.py > -@@ -663,8 +663,6 @@ if modules_ENABLED: > +@@ -760,8 +760,6 @@ if modules_ENABLED: > # Utility methods for building with Cython > - > - def add_cython_ext(*args, **kwargs): > + > + def do_add_cython_ext(*args, **kwargs): > - if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): > - return > if not cython_ENABLED: > raise ValueError(f"cannot build {args}: cython compilation is disabled") > if cython_tracing_ENABLED: > -@@ -1809,9 +1807,6 @@ else: > +@@ -1971,9 +1969,6 @@ else: > if root_prefix.endswith("/usr"): > - #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" > + # 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}") > + print(f" root_prefix={root_prefix!r}") > build_xpra_conf(root_prefix) > - > -@@ -1955,13 +1950,6 @@ else: > + > +@@ -2116,13 +2111,6 @@ else: > if uinput_ENABLED: > add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) > - > -- #gentoo does weird things, calls --no-compile with build *and* install > -- #then expects to find the cython modules!? ie: > + > +- # gentoo does weird things, calls --no-compile with build *and* install > +- # then expects to find the cython modules!? ie: > - #> python2.7 setup.py build -b build-2.7 install --no-compile \ > - # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 > -- #otherwise we use the flags to skip pkgconfig > -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): > +- # otherwise we use the flags to skip pkgconfig > +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 > - pkgconfig = no_pkgconfig > - > + > if OSX and "py2app" in sys.argv: > import py2app #@UnresolvedImport > diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch > similarity index 90% > rename from gnu/packages/patches/xpra-5.0-systemd-run.patch > rename to gnu/packages/patches/xpra-6.0-systemd-run.patch > index 437a8cc37f..2d60c29423 100644 > --- a/gnu/packages/patches/xpra-5.0-systemd-run.patch > +++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch > @@ -3,12 +3,12 @@ Distriction specific patch, not going upstream > Disable systemd-run if the command is not found. > > diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py > -index 3813331a5..46e2c83a6 100755 > +index 1c5e8ddaad..084aabe792 100755 > --- a/xpra/scripts/main.py > +++ b/xpra/scripts/main.py > -@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool: > +@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: > cmd = ["systemd-run", "--quiet"] > - if getuid()!=0: > + if getuid() != 0: > cmd += ["--user"] > - cmd += ["--scope", "--", "true"] > - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) > @@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755 > + r = proc.returncode > except TimeoutExpired: # pragma: no cover > r = None > -- return r==0 > +- return r == 0 > + if r is None: > + try: > + proc.terminate() > @@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755 > + return r==0 > + except FileNotFoundError: > + return False > - > + > + > def verify_gir(): > - try: > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm > index 74059a2691..1f1fe4d7c6 100644 > --- a/gnu/packages/xorg.scm > +++ b/gnu/packages/xorg.scm > @@ -76,6 +76,7 @@ (define-module (gnu packages xorg) > #:use-module (gnu packages check) > #:use-module (gnu packages cups) > #:use-module (gnu packages compression) > + #:use-module (gnu packages digest) > #:use-module (gnu packages emacs) > #:use-module (gnu packages flex) > #:use-module (gnu packages fonts) > @@ -6157,16 +6158,16 @@ (define-public xcompmgr > (define-public xpra > (package > (name "xpra") > - (version "5.0.8") > + (version "6.0") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.xpra.org/src/xpra-" > version ".tar.xz")) > (sha256 > - (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) > - (patches (search-patches "xpra-5.0-systemd-run.patch" > - "xpra-5.0-install_libs.patch")))) > + (base32 "1dh89k2whvim4lgnryr9hisdq2zzcc5md9c3vm49y6jsp4j77glq")) > + (patches (search-patches "xpra-6.0-systemd-run.patch" > + "xpra-6.0-install_libs.patch")))) > (build-system python-build-system) > (inputs > (list bash-minimal ; for wrap-program > @@ -6192,6 +6193,7 @@ (define-public xpra > xf86-video-dummy > xf86-input-mouse > xf86-input-keyboard > + xxhash > python-pillow > ;; Optional dependencies. > libx264 > @@ -6207,7 +6209,7 @@ (define-public xpra > python-lz4 ; Faster compression than zlib. > python-netifaces > python-pycups)) > - (native-inputs (list pkg-config pandoc python-cython)) > + (native-inputs (list pkg-config pandoc python-cython-3)) > (arguments > (list > #:configure-flags #~(list "--without-Xdummy" > > base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5 -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Mon May 13 11:44:43 2024 Received: (at 70881) by debbugs.gnu.org; 13 May 2024 15:44:43 +0000 Received: from localhost ([127.0.0.1]:33390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Xr0-00009Z-Ko for submit@debbugs.gnu.org; Mon, 13 May 2024 11:44:43 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:47396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Xqw-00009T-M3 for 70881@debbugs.gnu.org; Mon, 13 May 2024 11:44:42 -0400 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f05b669b6cso20523475ad.3 for <70881@debbugs.gnu.org>; Mon, 13 May 2024 08:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715615012; x=1716219812; 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=WmdKFgNDt6PXU2vKqkOQjvGUU7NoZsfwPLLRuEtcbPU=; b=Iu8MnbAOtGyPjzSckDMIlRweaVD+6MauVzDye1Or40EDl36QG+VjH1bUlSbJeESvCB wvrBVUqSftxjLOdiUMtr+c1rZ/C0s3DM0jxZCRSj/MPZHfBq7U0PFzxHpOlEWC6W+n1X JdbXNwjyVpc32wLJ98M3Al538FBYafMpcdA6fj1ihtirbIct+pGOdwraPNgVs8XIrIa8 +i35DbvNQRrVYLgfO6SVZghQFTop4C7kETaea5qrPivGIh2PFPM/5wUlTAqf2e70+usE Lvi7wclWUSh18NB9huzozjzjKdgrjBCK7QHt9qHZVyng62jfsez8P3CP4utKLNpJk9eV +wgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715615012; x=1716219812; 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=WmdKFgNDt6PXU2vKqkOQjvGUU7NoZsfwPLLRuEtcbPU=; b=WfkRPAyGJb0mxp5AJ2CI4YmdLrjzEH7rQrUPNZWqTujtdTFP7gOQz4JdFSTWYg82N/ AejoeA0SAtt2H5z4yVMvGmTYKXxVzxKZ+iMbaC+6CqgkewSxJrJ7SvrknfvW3EokNo3+ xvRq3OxZN3gjd5R0Z8Qad4M8OW0KvGkV4l4gV6pqFmjKqXLQNZKjuJqxSszAP+W/C9mx UXkCm8mGQqAgDthRpppwK8LjU1KZOzKZiM6ROIkO8dwACJBWCxdgZLqeR7XyCguZX7rs Y5U+24EPLFDvgpOqTaAYxN5KfXer3ZO2apO8VrQT08theOykfqV2hb3nHk0vAK8IGdwA mMzQ== X-Forwarded-Encrypted: i=1; AJvYcCU9V9P3ewkXYUC+VHFWyaEhkyXSqqGcuGvlbVtlUZzisCg6PTVDHEowrDxpe4G+Gr7ATFqu6u5XDJf0m6/2i8wCke/HxDQ= X-Gm-Message-State: AOJu0YxRoz00J8iBAXvRP4hn0t1/koKOUu6OgURNLAOySTSwW4mCw590 cyU0EfGpvde5kd2NcVGBhYdjZPxIUKPQIXFvyDbVbzU4/vufKr1tGA7bEQ== X-Google-Smtp-Source: AGHT+IGAleiKHDdCUYM1amQ3Bln2+H69mzdI8/0I2pdmtyJ9R6fJuyhgYleyvJdzJ73TIVpMKHCdeA== X-Received: by 2002:a17:903:2d1:b0:1ea:201:5843 with SMTP id d9443c01a7336-1ef43c0e8f2mr132791015ad.6.1715615012112; Mon, 13 May 2024 08:43:32 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c25683dsm80130335ad.299.2024.05.13.08.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 08:43:31 -0700 (PDT) From: Andy Tai To: guix-patches@gnu.org, 70881@debbugs.gnu.org, ngraves@ngraves.fr Subject: [PATCH v2] gnu: xpra: Update to 6.0. Date: Mon, 13 May 2024 08:43:29 -0700 Message-Id: <5ebbe8944573e337c0e1562ef1e603e214807dbc.1715614980.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 70881 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/xorg.scm (xpra): Update to 6.0. [inputs]: Add xxhash. [native-inputs]: Change python-cython to python-cython-3. * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. * gnu/local.mk (dist_patch_DATA): Update accordingly Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc --- gnu/local.mk | 4 +-- ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- gnu/packages/xorg.scm | 12 ++++---- 4 files changed, 30 insertions(+), 28 deletions(-) rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) diff --git a/gnu/local.mk b/gnu/local.mk index 439fe587b0..bc0fe77e93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2231,8 +2231,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-5.0-systemd-run.patch \ - %D%/packages/patches/xpra-5.0-install_libs.patch \ + %D%/packages/patches/xpra-6.0-systemd-run.patch \ + %D%/packages/patches/xpra-6.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-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch similarity index 67% rename from gnu/packages/patches/xpra-5.0-install_libs.patch rename to gnu/packages/patches/xpra-6.0-install_libs.patch index 4d40bf1f79..c608b519f4 100644 --- a/gnu/packages/patches/xpra-5.0-install_libs.patch +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch @@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during the 'install stage. diff --git a/setup.py b/setup.py -index e254bf99c..90db55c3f 100755 +index 4f066fa8bf..14a9ed65ed 100755 --- a/setup.py +++ b/setup.py -@@ -663,8 +663,6 @@ if modules_ENABLED: +@@ -760,8 +760,6 @@ if modules_ENABLED: # Utility methods for building with Cython - - def add_cython_ext(*args, **kwargs): + + def do_add_cython_ext(*args, **kwargs): - if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): - return if not cython_ENABLED: raise ValueError(f"cannot build {args}: cython compilation is disabled") if cython_tracing_ENABLED: -@@ -1809,9 +1807,6 @@ else: +@@ -1971,9 +1969,6 @@ else: if root_prefix.endswith("/usr"): - #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" + # 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}") + print(f" root_prefix={root_prefix!r}") build_xpra_conf(root_prefix) - -@@ -1955,13 +1950,6 @@ else: + +@@ -2116,13 +2111,6 @@ else: if uinput_ENABLED: add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) - -- #gentoo does weird things, calls --no-compile with build *and* install -- #then expects to find the cython modules!? ie: + +- # gentoo does weird things, calls --no-compile with build *and* install +- # then expects to find the cython modules!? ie: - #> python2.7 setup.py build -b build-2.7 install --no-compile \ - # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 -- #otherwise we use the flags to skip pkgconfig -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): +- # otherwise we use the flags to skip pkgconfig +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 - pkgconfig = no_pkgconfig - + if OSX and "py2app" in sys.argv: import py2app #@UnresolvedImport diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch similarity index 90% rename from gnu/packages/patches/xpra-5.0-systemd-run.patch rename to gnu/packages/patches/xpra-6.0-systemd-run.patch index 437a8cc37f..2d60c29423 100644 --- a/gnu/packages/patches/xpra-5.0-systemd-run.patch +++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch @@ -3,12 +3,12 @@ Distriction specific patch, not going upstream Disable systemd-run if the command is not found. diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 3813331a5..46e2c83a6 100755 +index 1c5e8ddaad..084aabe792 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool: +@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: cmd = ["systemd-run", "--quiet"] - if getuid()!=0: + if getuid() != 0: cmd += ["--user"] - cmd += ["--scope", "--", "true"] - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) @@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755 + r = proc.returncode except TimeoutExpired: # pragma: no cover r = None -- return r==0 +- return r == 0 + if r is None: + try: + proc.terminate() @@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755 + return r==0 + except FileNotFoundError: + return False - + + def verify_gir(): - try: diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 74059a2691..1f1fe4d7c6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -76,6 +76,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages check) #:use-module (gnu packages cups) #:use-module (gnu packages compression) + #:use-module (gnu packages digest) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) @@ -6157,16 +6158,16 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "5.0.8") + (version "6.0") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) - (patches (search-patches "xpra-5.0-systemd-run.patch" - "xpra-5.0-install_libs.patch")))) + (base32 "1dh89k2whvim4lgnryr9hisdq2zzcc5md9c3vm49y6jsp4j77glq")) + (patches (search-patches "xpra-6.0-systemd-run.patch" + "xpra-6.0-install_libs.patch")))) (build-system python-build-system) (inputs (list bash-minimal ; for wrap-program @@ -6192,6 +6193,7 @@ (define-public xpra xf86-video-dummy xf86-input-mouse xf86-input-keyboard + xxhash python-pillow ;; Optional dependencies. libx264 @@ -6207,7 +6209,7 @@ (define-public xpra python-lz4 ; Faster compression than zlib. python-netifaces python-pycups)) - (native-inputs (list pkg-config pandoc python-cython)) + (native-inputs (list pkg-config pandoc python-cython-3)) (arguments (list #:configure-flags #~(list "--without-Xdummy" base-commit: 7ca9809cdbfe326294a5d8c64b4b8c59d0e76bea -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 13 13:11:04 2024 Received: (at 70881) by debbugs.gnu.org; 13 May 2024 17:11:04 +0000 Received: from localhost ([127.0.0.1]:33821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6ZCZ-0003yY-OF for submit@debbugs.gnu.org; Mon, 13 May 2024 13:11:04 -0400 Received: from 16.mo584.mail-out.ovh.net ([188.165.55.104]:40857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6ZCW-0003yB-JP for 70881@debbugs.gnu.org; Mon, 13 May 2024 13:11:02 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.2.72]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4VdQxF4lh2z1FRY for <70881@debbugs.gnu.org>; Mon, 13 May 2024 17:10:57 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kxrg4 (unknown [10.108.54.148]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 114831FD91; Mon, 13 May 2024 17:10:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-kxrg4 with ESMTPSA id B1X8LKBJQmamMQQAn9kkbA (envelope-from ); Mon, 13 May 2024 17:10:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003b34b80fc-5ea4-420b-a910-fe3e857f7fe0, AFD3D7969371CC029319C969337B9752385513BA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves To: Andy Tai , guix-patches@gnu.org, 70881@debbugs.gnu.org Subject: Re: [PATCH v2] gnu: xpra: Update to 6.0. In-Reply-To: <5ebbe8944573e337c0e1562ef1e603e214807dbc.1715614980.git.atai@atai.org> References: <5ebbe8944573e337c0e1562ef1e603e214807dbc.1715614980.git.atai@atai.org> Date: Mon, 13 May 2024 19:10:55 +0200 Message-ID: <874jb11vts.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 5305521840005964498 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeggedguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefvefgueeiheevjeduleelveduueetvdeggfduheevudehtddutdefkedugedvffenucffohhmrghinhepgihprhgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekkeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70881 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) LGTM. Built and rebuilt deterministically. No major lint complaints. Patches seem fine. On 2024-05-13 08:43, Andy Tai wrote: > * gnu/packages/xorg.scm (xpra): Update to 6.0. > [inputs]: Add xxhash. > [native-inputs]: Change python-cython to python-cython-3. > * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. > * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. > * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. > * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. > * gnu/local.mk (dist_patch_DATA): Update accordingly > > Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc > --- > gnu/local.mk | 4 +-- > ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- > ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- > gnu/packages/xorg.scm | 12 ++++---- > 4 files changed, 30 insertions(+), 28 deletions(-) > rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) > rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) > > diff --git a/gnu/local.mk b/gnu/local.mk > index 439fe587b0..bc0fe77e93 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -2231,8 +2231,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-5.0-systemd-run.patch \ > - %D%/packages/patches/xpra-5.0-install_libs.patch \ > + %D%/packages/patches/xpra-6.0-systemd-run.patch \ > + %D%/packages/patches/xpra-6.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-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch > similarity index 67% > rename from gnu/packages/patches/xpra-5.0-install_libs.patch > rename to gnu/packages/patches/xpra-6.0-install_libs.patch > index 4d40bf1f79..c608b519f4 100644 > --- a/gnu/packages/patches/xpra-5.0-install_libs.patch > +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch > @@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during > the 'install stage. > > diff --git a/setup.py b/setup.py > -index e254bf99c..90db55c3f 100755 > +index 4f066fa8bf..14a9ed65ed 100755 > --- a/setup.py > +++ b/setup.py > -@@ -663,8 +663,6 @@ if modules_ENABLED: > +@@ -760,8 +760,6 @@ if modules_ENABLED: > # Utility methods for building with Cython > - > - def add_cython_ext(*args, **kwargs): > + > + def do_add_cython_ext(*args, **kwargs): > - if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): > - return > if not cython_ENABLED: > raise ValueError(f"cannot build {args}: cython compilation is disabled") > if cython_tracing_ENABLED: > -@@ -1809,9 +1807,6 @@ else: > +@@ -1971,9 +1969,6 @@ else: > if root_prefix.endswith("/usr"): > - #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" > + # 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}") > + print(f" root_prefix={root_prefix!r}") > build_xpra_conf(root_prefix) > - > -@@ -1955,13 +1950,6 @@ else: > + > +@@ -2116,13 +2111,6 @@ else: > if uinput_ENABLED: > add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) > - > -- #gentoo does weird things, calls --no-compile with build *and* install > -- #then expects to find the cython modules!? ie: > + > +- # gentoo does weird things, calls --no-compile with build *and* install > +- # then expects to find the cython modules!? ie: > - #> python2.7 setup.py build -b build-2.7 install --no-compile \ > - # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 > -- #otherwise we use the flags to skip pkgconfig > -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): > +- # otherwise we use the flags to skip pkgconfig > +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 > - pkgconfig = no_pkgconfig > - > + > if OSX and "py2app" in sys.argv: > import py2app #@UnresolvedImport > diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch > similarity index 90% > rename from gnu/packages/patches/xpra-5.0-systemd-run.patch > rename to gnu/packages/patches/xpra-6.0-systemd-run.patch > index 437a8cc37f..2d60c29423 100644 > --- a/gnu/packages/patches/xpra-5.0-systemd-run.patch > +++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch > @@ -3,12 +3,12 @@ Distriction specific patch, not going upstream > Disable systemd-run if the command is not found. > > diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py > -index 3813331a5..46e2c83a6 100755 > +index 1c5e8ddaad..084aabe792 100755 > --- a/xpra/scripts/main.py > +++ b/xpra/scripts/main.py > -@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool: > +@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: > cmd = ["systemd-run", "--quiet"] > - if getuid()!=0: > + if getuid() != 0: > cmd += ["--user"] > - cmd += ["--scope", "--", "true"] > - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) > @@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755 > + r = proc.returncode > except TimeoutExpired: # pragma: no cover > r = None > -- return r==0 > +- return r == 0 > + if r is None: > + try: > + proc.terminate() > @@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755 > + return r==0 > + except FileNotFoundError: > + return False > - > + > + > def verify_gir(): > - try: > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm > index 74059a2691..1f1fe4d7c6 100644 > --- a/gnu/packages/xorg.scm > +++ b/gnu/packages/xorg.scm > @@ -76,6 +76,7 @@ (define-module (gnu packages xorg) > #:use-module (gnu packages check) > #:use-module (gnu packages cups) > #:use-module (gnu packages compression) > + #:use-module (gnu packages digest) > #:use-module (gnu packages emacs) > #:use-module (gnu packages flex) > #:use-module (gnu packages fonts) > @@ -6157,16 +6158,16 @@ (define-public xcompmgr > (define-public xpra > (package > (name "xpra") > - (version "5.0.8") > + (version "6.0") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.xpra.org/src/xpra-" > version ".tar.xz")) > (sha256 > - (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) > - (patches (search-patches "xpra-5.0-systemd-run.patch" > - "xpra-5.0-install_libs.patch")))) > + (base32 "1dh89k2whvim4lgnryr9hisdq2zzcc5md9c3vm49y6jsp4j77glq")) > + (patches (search-patches "xpra-6.0-systemd-run.patch" > + "xpra-6.0-install_libs.patch")))) > (build-system python-build-system) > (inputs > (list bash-minimal ; for wrap-program > @@ -6192,6 +6193,7 @@ (define-public xpra > xf86-video-dummy > xf86-input-mouse > xf86-input-keyboard > + xxhash > python-pillow > ;; Optional dependencies. > libx264 > @@ -6207,7 +6209,7 @@ (define-public xpra > python-lz4 ; Faster compression than zlib. > python-netifaces > python-pycups)) > - (native-inputs (list pkg-config pandoc python-cython)) > + (native-inputs (list pkg-config pandoc python-cython-3)) > (arguments > (list > #:configure-flags #~(list "--without-Xdummy" > > base-commit: 7ca9809cdbfe326294a5d8c64b4b8c59d0e76bea -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Tue May 14 09:55:52 2024 Received: (at 70881-done) by debbugs.gnu.org; 14 May 2024 13:55:52 +0000 Received: from localhost ([127.0.0.1]:39487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6sdD-0005SS-T5 for submit@debbugs.gnu.org; Tue, 14 May 2024 09:55:52 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6sdB-0005SI-JH; Tue, 14 May 2024 09:55:50 -0400 Received: from localhost (unknown [45.67.83.168]) by mira.cbaines.net (Postfix) with ESMTPSA id 5978327BBE2; Tue, 14 May 2024 14:55:17 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ff7e9ed4; Tue, 14 May 2024 13:55:15 +0000 (UTC) From: Christopher Baines To: Nicolas Graves via Guix-patches via Subject: Re: [bug#70919] [PATCH v2] gnu: xpra: Update to 6.0. In-Reply-To: <874jb11vts.fsf@ngraves.fr> (Nicolas Graves via Guix-patches via's message of "Mon, 13 May 2024 19:10:55 +0200") References: <5ebbe8944573e337c0e1562ef1e603e214807dbc.1715614980.git.atai@atai.org> <874jb11vts.fsf@ngraves.fr> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Tue, 14 May 2024 14:55:13 +0100 Message-ID: <87v83gxzum.fsf@cbaines.net> 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: 70881-done Cc: 70919-done@debbugs.gnu.org, 70881-done@debbugs.gnu.org, Nicolas Graves , atai@atai.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Nicolas Graves via Guix-patches via writes: > LGTM. Built and rebuilt deterministically. No major lint > complaints. Patches seem fine. > > > On 2024-05-13 08:43, Andy Tai wrote: > >> * gnu/packages/xorg.scm (xpra): Update to 6.0. >> [inputs]: Add xxhash. >> [native-inputs]: Change python-cython to python-cython-3. >> * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. >> * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. >> * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. >> * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. >> * gnu/local.mk (dist_patch_DATA): Update accordingly >> >> Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc >> --- >> gnu/local.mk | 4 +-- >> ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- >> ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- >> gnu/packages/xorg.scm | 12 ++++---- >> 4 files changed, 30 insertions(+), 28 deletions(-) >> rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) >> rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) Thanks both, I've pushed this to master as 61140300c20609f540029e30b72b7bf466f259cd. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZDbUFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfZBA/9H3eqdk6M3pD8zTaHIcyqFRsdFhgKQaC5 6IDKXWNbc+GPOMKvWk03tpJZDNTEESfKat8RFVMqt+cwLGE3En5VmCZ58MLFGehb Jd4r//nD3r9aUyxrvTQJb7sSQa7iU5K8N6vEoAhZYyLgTGV9gvxMsM7QMcYcYKgA F29/dJMRxmsh4bTDNlH9r3SeLtzSiXeL6NofTlkMQomHBf3r5SJbgplTs5MuLzlM DWh1cGnu7IVCDn+35Raj8bGziVRoVcpgJoYL1iPD+h4jx03swRJEM71Z4XjbaPom V1Nip1PfYD6qXItGTNrl9zFfHd1Ya6dARgM7obcde38AVTtJalyMv/Xw7ejkzYSM EzjSjZxeuuYmGOyALZGR19kXywpfh7axN6zWznO/xGKzvgif4lqgaQxDnhnETzCa CsIU/vODymqdrZdWm2ZHqOnOZ7uZziE0mAFB+xJPnxTA2M5lo1XUEhqbPiq3kyM0 5Fzf367DBLyrGyVc+ZvcT0DWDM2hvZcUdGjWz/eLLBTGBh1FyVnyf0kOn9Sx726G JCljD3cnJMrB0EhtOKgTsD7NvBs9jQSltS0HbxvxTqSfVp84M8S+w4N1OjZCog6p W5iKQhUc8AV4spB7Iuw+8iO8BrKLtf9WzT3N7k+6KfK6KWLMnACdJbJMCuXvP148 MSDNt6QU6qE= =IS7F -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 20:12:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 12 Jun 2024 11:24:19 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator