From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id qH2gKvW1P2ayowAAqHPOHw:P1 (envelope-from ) for ; Sat, 11 May 2024 20:16:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id qH2gKvW1P2ayowAAqHPOHw (envelope-from ) for ; Sat, 11 May 2024 20:16:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ca39mzda; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715451381; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=K6yqVAfaB9ibneQ3LQzKkbeUQs67BnYGVKMHt93sdhw=; b=kEKCMOiNs3057x9kWVRCPMmm3OBtqER7YmvlKfc3LGeWDA1hX/lQGIUniI3BuAQxmJh2J5 Vldj7x0a+xZ4KW61xGiK5IgehJ6dacmPulf2NGzXYkQ3hCxT9cEtjtTG6LXzfjR5gFAM4z LLvIIG29dRkkj5xaZ+x4Rqj6BzIN3KCaPpIz8dHAyNpKcMzghCqaSs0g/cxUwn6Re3qMTf Dho5Vr0dkM0NOhZGtovbZ+3y55Z7Gk8W5B8QARNjzUVl+YjRF3AnbElGh36AF7x9RxLhgf d3it31N1+wtgUlZ+MOxTKLbi5BkjoTY0FR8/EIzPuVkT7mNYV5RhnbAudRq6VQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ca39mzda; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715451381; a=rsa-sha256; cv=none; b=MbcWLFuZBLSpqE0t0O1N11jMfs6ZftUWUdGmlHYye8rMEL5k8LxRsMCPwrnKeYG96P7hdr tQxmpRjL6ZpcYJ0bbTfC8/IGLHqZw7j7bTRbaM1tIaIgMllTt7dsPOImIM1XLUmeNVAUXR a2qE9+RW4kwy0QpS0PpCq//u9BQnj0Be298yZFYrV0jjyi40DMbRiRhiYwZ6a9UFwCu4af zShYLzo23YiBUy7EbbvGrIEEsOzLsyOqfvl+8LHyoIXxhkP5UTa8G/rjzceI/k8/ypBQA+ Fn5zC64n28BfJjQb5VAYB46HDOtNFzGJIZCE5Fj7zIDZY5aPzss/GQ4cXniIFQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 108F754559 for ; Sat, 11 May 2024 20:16:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5rGP-0005aN-PK; Sat, 11 May 2024 14:16:05 -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 1s5rGN-0005Zq-Sz for guix-patches@gnu.org; Sat, 11 May 2024 14:16:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5rGN-0003H4-9X for guix-patches@gnu.org; Sat, 11 May 2024 14:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5rGM-0004bV-CA for guix-patches@gnu.org; Sat, 11 May 2024 14:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70881] [PATCH] gnu: xpra: Update to 6.0. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70881@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171545136117672 (code B ref -1); Sat, 11 May 2024 18:16:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.08 X-Spam-Score: -1.08 X-Migadu-Queue-Id: 108F754559 X-Migadu-Scanner: mx13.migadu.com X-TUID: rkJYnCQkHYFU * 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