From patchwork Fri Sep 22 03:58:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 54148 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B492427BBE9; Fri, 22 Sep 2023 04:59:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6214127BBE2 for ; Fri, 22 Sep 2023 04:59:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjXJf-0007hM-LD; Thu, 21 Sep 2023 23:58:55 -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 1qjXJb-0007gu-W0 for guix-patches@gnu.org; Thu, 21 Sep 2023 23:58:52 -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 1qjXJb-000373-Nq for guix-patches@gnu.org; Thu, 21 Sep 2023 23:58:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjXJl-0003Pg-QW for guix-patches@gnu.org; Thu, 21 Sep 2023 23:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65849] [PATCH v5] gnu: xpra: Update to 5.0.2 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 03:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65849@debbugs.gnu.org Cc: Andy Tai Received: via spool by 65849-submit@debbugs.gnu.org id=B65849.169535514113110 (code B ref 65849); Fri, 22 Sep 2023 03:59:01 +0000 Received: (at 65849) by debbugs.gnu.org; 22 Sep 2023 03:59:01 +0000 Received: from localhost ([127.0.0.1]:35096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjXJj-0003PN-SG for submit@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 ) id 1qjXJe-0003P3-RS for 65849@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@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 Date: Thu, 21 Sep 2023 20:58:32 -0700 Message-ID: <5940d9f96a58bcb948f54adabe6fac6cd64f68e3.1695355042.git.atai@atai.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Andy Tai * 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%) base-commit: 5d2593be0a9a766dfb1d93490047940b7b81d381 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)