From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0GBeG1ZZvWDTXAEAgWs5BA (envelope-from ) for ; Mon, 07 Jun 2021 01:25:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SwSbFlZZvWD8TgAA1q6Kng (envelope-from ) for ; Sun, 06 Jun 2021 23:25:10 +0000 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 8CB0BF4C3 for ; Mon, 7 Jun 2021 01:25:09 +0200 (CEST) Received: from localhost ([::1]:48468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq28i-0004vy-5X for larch@yhetil.org; Sun, 06 Jun 2021 19:25:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq28c-0004vp-PH for guix-patches@gnu.org; Sun, 06 Jun 2021 19:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq28c-0006kp-J3 for guix-patches@gnu.org; Sun, 06 Jun 2021 19:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq28c-0005NR-Ft for guix-patches@gnu.org; Sun, 06 Jun 2021 19:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48890] [PATCH] gnu: xpra: Update to 4.2. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 23:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48890@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162302188020636 (code B ref -1); Sun, 06 Jun 2021 23:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 23:24:40 +0000 Received: from localhost ([127.0.0.1]:54134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq289-0005Me-KA for submit@debbugs.gnu.org; Sun, 06 Jun 2021 19:24:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:35972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq287-0005MW-C5 for submit@debbugs.gnu.org; Sun, 06 Jun 2021 19:24:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq287-0004tm-4m for guix-patches@gnu.org; Sun, 06 Jun 2021 19:24:31 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:11516 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq285-0006Oa-0A for guix-patches@gnu.org; Sun, 06 Jun 2021 19:24:30 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lq282-0008E6-DU; Sun, 06 Jun 2021 23:24:26 +0000 From: Matthew James Kraai Date: Sun, 6 Jun 2021 16:24:22 -0700 Message-Id: <20210606232422.19270-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623021910; 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; bh=wPNbxV1aZPh348njJ39vNN2XcxN3doXl2hFZTL2ka/U=; b=WB7n8ubH6GGsTFitYaAOSvC2fwQ01GyZwquIWLkUt0g23kWfW8eCiTCIiTLw2LUOX207Ct gV8wwkAFiYPEBXV7veTGnhQR2ogOhBxsiG04HaNkQ9iESnllddEaslbu5VqWcSHfHHm8L2 6S6/oUwoaMCXLdSYrVoOoC37NGu2dNkbCnXmLFg3SISLMpmB9lnn6KNlEOxjntp2INMK3x kU7/NEk7YvwTcObKvIGhqg2rrpGLZdXsS9JDmGIUnMcQl2fEFEXfWTf4xmS8B2JmiYwR6m /SqBAB9yxcgi3hZQhZnpGVe6dcMnsanl7ypGxk1X3UPZPLLtKeViillYPJ6uig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623021910; a=rsa-sha256; cv=none; b=mDzALT7TggAU9Xy2RMTR1vaKIlTQ8UVEy/exxK0JPwyrEYNKpDZhrr+MjQ5PwAhsaSr4Ow 6hKY3CcjTZhHAGZ6dKR1UuDDrQajOkGULrNS/Z/ZrURkaYfiOj9sunrL6casbrusxhPKBi WQUqG1Gvt8MuaI7y4z928ri0xTm0JXBGyGobFSbuCRML7Kx7hJUbRsed5Rx7SsKfkxe02p 9dmxCDfFTsr7nUKmWhTzKpRiIdwo+MPZET3spetNsnQFdOGGbDBkipCk0pM9DxEwGcdb2r SdFy3W2MOcg3x6Hhmg7YsT2HzFuQ+WkKneVA5s2Ie/+eNFy0H2puz7fbbp1EwQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.57 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8CB0BF4C3 X-Spam-Score: 2.57 X-Migadu-Scanner: scn1.migadu.com X-TUID: /KIzJhx+BO23 * gnu/packages/xorg.scm (xpra): Update to 4.2. [source]: Switch to ".tar.gz" archive and update patch file. [inputs]: Add pandoc. [arguments]: Adjust custom 'fix-paths phase for changes in source. * gnu/packages/patches/xpra-4.2-systemd-run.patch: Renamed file. * gnu/local.mk (dist_patch_DATA): Rename file. --- gnu/local.mk | 2 +- .../patches/xpra-4.0.1-systemd-run.patch | 34 -------------- .../patches/xpra-4.2-systemd-run.patch | 45 +++++++++++++++++++ gnu/packages/xorg.scm | 16 ++++--- 4 files changed, 55 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/xpra-4.0.1-systemd-run.patch create mode 100644 gnu/packages/patches/xpra-4.2-systemd-run.patch diff --git a/gnu/local.mk b/gnu/local.mk index 153f6ee8d7..0599df8968 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1830,7 +1830,7 @@ 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.0.1-systemd-run.patch \ + %D%/packages/patches/xpra-4.2-systemd-run.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.0.1-systemd-run.patch b/gnu/packages/patches/xpra-4.0.1-systemd-run.patch deleted file mode 100644 index 1ea11830a5..0000000000 --- a/gnu/packages/patches/xpra-4.0.1-systemd-run.patch +++ /dev/null @@ -1,34 +0,0 @@ -Disable systemd-run if the command is not found. - -diff -Naur xpra-4.0.1/xpra/scripts/main.py xpra-4.0.1.patched/xpra/scripts/main.py ---- xpra-4.0.1/xpra/scripts/main.py 2020-05-17 18:12:15.000000000 +0200 -+++ xpra-4.0.1.patched/xpra/scripts/main.py 2020-06-01 12:12:18.500257507 +0200 -@@ -312,16 +312,18 @@ - if not is_systemd_pid1(): - return False - #test it: -- cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] -- proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) -- r = pollwait(proc, timeout=1) -- if r is None: -- try: -- proc.terminate() -- except Exception: -- pass -- return r==0 -- -+ try: -+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] -+ proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) -+ r = pollwait(proc, timeout=1) -+ if r is None: -+ try: -+ proc.terminate() -+ except Exception: -+ pass -+ return r==0 -+ except FileNotFoundError: -+ return False - - def run_mode(script_file, error_cb, options, args, mode, defaults): - #configure default logging handler: diff --git a/gnu/packages/patches/xpra-4.2-systemd-run.patch b/gnu/packages/patches/xpra-4.2-systemd-run.patch new file mode 100644 index 0000000000..8dfd9c82f0 --- /dev/null +++ b/gnu/packages/patches/xpra-4.2-systemd-run.patch @@ -0,0 +1,45 @@ +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"] +- proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) + try: +- proc.communicate(timeout=2) +- r = proc.returncode +- 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: +- proc.terminate() +- except Exception: +- pass +- try: +- proc.communicate(timeout=1) ++ proc.communicate(timeout=2) ++ r = proc.returncode + except TimeoutExpired: # pragma: no cover + r = None +- return r==0 ++ if r is None: ++ try: ++ proc.terminate() ++ except Exception: ++ pass ++ try: ++ proc.communicate(timeout=1) ++ except TimeoutExpired: # pragma: no cover ++ r = None ++ return r==0 ++ except FileNotFoundError: ++ return False + + + def run_mode(script_file, error_cb, options, args, mode, defaults): diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9156fb3163..e123c6f9ce 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages inkscape) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -6300,15 +6301,15 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "4.0.6") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" - version ".tar.xz")) + version ".tar.gz")) (sha256 - (base32 "1s49y2s75a8a70vj0micnmpic5zv1n32yjxy8fkxsqa6j5njyrww")) - (patches (search-patches "xpra-4.0.1-systemd-run.patch")))) + (base32 "1yg9asi3i3wf73ibc006xv3g77axvbyp81lyinwq27syabh30i1a")) + (patches (search-patches "xpra-4.2-systemd-run.patch")))) (build-system python-build-system) ;; see also http://xpra.org/trac/wiki/Dependencies (inputs `( @@ -6337,6 +6338,7 @@ basic eye-candy effects.") ("libx264" ,libx264) ("x265" ,x265) ("libvpx" ,libvpx) + ("pandoc" ,pandoc) ("python-rencode" ,python-rencode) ; For speed. ("python-numpy" ,python-numpy) ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. @@ -6383,7 +6385,7 @@ basic eye-candy effects.") (close-port file))) ;; Add Xorg module paths. (append-to-file - "etc/xpra/xorg.conf" + "fs/etc/xpra/xorg.conf" (string-append "\nSection \"Files\"\nModulePath \"" (assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules," (assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules," @@ -6391,8 +6393,8 @@ basic eye-candy effects.") (assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n" "EndSection\n\n")) (substitute* '("xpra/scripts/config.py" - "etc/xpra/conf.d/60_server.conf.in" - "unittests/unit/server/mixins/notification_test.py") + "fs/etc/xpra/conf.d/60_server.conf.in" + "tests/unittests/unit/server/mixins/notification_test.py") ;; The trailing -- is intentional, so we only replace it inside ;; a command line. (("dbus-launch --") -- 2.31.1