From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iAI7CCtaFGVCYQAAG6o9tA:P1 (envelope-from ) for ; Wed, 27 Sep 2023 18:36:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iAI7CCtaFGVCYQAAG6o9tA (envelope-from ) for ; Wed, 27 Sep 2023 18:36:59 +0200 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 40AB36162E for ; Wed, 27 Sep 2023 18:36:58 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=iy4bbhbS; 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=1695832619; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ww3MArLo4yUZ1cpex0L9to2zIM4RBpCkavMTxpjumiU=; b=ijUL0QPFas6VMHPfFShPhxmZNccRlHgQ/HXadNf2l/3k6jhc87NwJUTe2KHhW2jUzno/fd RiJ6eMJxo2bTgwzrvGZB6d/UZKpVNj3ULhCoeCfAwq8yZK/iWnECifd/lXsnTwIsCTVK9C JfQ0m9sfPdnp/Z8itD9LoOT5RxdJDxzYVes+KH1VWzuN0Jag1gAVmOxtMd098YVbBeg3uj bmHTB7lhbkOMJoxhOf0rYlKzgx5DpQS+/UspD1O0MKzfANRzitjFDtkjiKMrQQf9Ty9ltS wFVs5L4aexsTzWdcl7e/g28PFTC3xsk89JhNvlxIlskcAERVR+qnMGRRkF+YEw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695832619; a=rsa-sha256; cv=none; b=g0zHVdNLFtNBAjOSK7udc9Q8SePvVXBaLS/dN8AWMCFwrW6DMnNBK0CLuSh0PaodkNKtUA X/BAVQyhp7DTqznlb2+jMCoRTtb+oOqWZq2XCEyNPo0R6A66qZlCPyKI6i7zsZ2Stqskv0 qdl0vO/GHw+JKhvsMLgSEh5FifpavOzbf+L95/pYRNXvaEkL6S6yM7Nlz32dMK6kL5JTJg il/mUDC1zxH+lkKkHQTg9ZRSB58gVKjy+ZzNhV49yrRKOgJjS6PMVshU5DvKhPYhTYphTn DKcHO4Fv+hVKKhQXfv63+kmrp66XyccjKkbLXKn0vYECKSkZCB2t/PckhP897A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=iy4bbhbS; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlXWt-0002dU-A1; Wed, 27 Sep 2023 12:36:51 -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 1qlXWr-0002cs-0t for guix-patches@gnu.org; Wed, 27 Sep 2023 12:36:49 -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 1qlXWq-0007ub-Oc for guix-patches@gnu.org; Wed, 27 Sep 2023 12:36:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlXX3-0001yY-UY for guix-patches@gnu.org; Wed, 27 Sep 2023 12:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65849] [PATCH v6] 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: Wed, 27 Sep 2023 16:37: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 moreinfo To: 65849@debbugs.gnu.org, mail@cbaines.net Cc: Andy Tai Received: via spool by 65849-submit@debbugs.gnu.org id=B65849.16958326037566 (code B ref 65849); Wed, 27 Sep 2023 16:37:01 +0000 Received: (at 65849) by debbugs.gnu.org; 27 Sep 2023 16:36:43 +0000 Received: from localhost ([127.0.0.1]:52343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlXWl-0001xy-3T for submit@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 ) id 1qlXWi-0001xh-Kx for 65849@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@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 Date: Wed, 27 Sep 2023 09:36:13 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -0.74 X-Spam-Score: -0.74 X-Migadu-Queue-Id: 40AB36162E X-TUID: issMLHb741py From: Andy Tai * 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] : 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