From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 06 19:24:40 2021 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: xpra: Update to 4.2. 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 X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Matthew James Kraai 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.1 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 07 03:37:26 2021 Received: (at 48890-done) by debbugs.gnu.org; 7 Jun 2021 07:37:26 +0000 Received: from localhost ([127.0.0.1]:54355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq9p4-0000rV-Jv for submit@debbugs.gnu.org; Mon, 07 Jun 2021 03:37:26 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:23108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq9oy-0000rD-JP for 48890-done@debbugs.gnu.org; Mon, 07 Jun 2021 03:37:20 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Fz4vV0yF9zQk33; Mon, 7 Jun 2021 09:37:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1623051428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GcEWEOZlGfD9r8P3kECZrzXlQwqXxpUvP0EJPjesbP0=; b=jc51qIWNuqsMq57Kj7XnrUaWjv1NCGkBkS8fUXWfpblHn91j8mPXVOaVXgAz0NEiIzNZm0 +/I1IEK78j73Zj9H79oSdN2XueaMPlv7o/ovhXIXJ24YqMZQK4DBbK4KJRok6miISiuOdu dAvTp/ZPC6+xsR6SWT0EwZVkSn5DVE6vg/W9PQNh3Hf2JoAS9GBofRMtFgGMXqqQhTgzxW JJi2vsdDTP4ry2qQRkyfgGWUj39cpF/wsETTkGvOUfOM4l93gYdCsExeZITamZX0t+/cZ4 ty1YqQzwc1po8Xj3/WP7W9lmoeO5Ql+3ukcTpbxpwvOis5jzyP1wo8e13U7fFw== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id ceR8D1acr-Np; Mon, 7 Jun 2021 09:37:07 +0200 (CEST) Date: Mon, 7 Jun 2021 09:37:05 +0200 From: Lars-Dominik Braun To: Matthew James Kraai Subject: Re: [bug#48890] [PATCH] gnu: xpra: Update to 4.2. Message-ID: References: <20210606232422.19270-1-kraai@ftbfs.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210606232422.19270-1-kraai@ftbfs.org> X-MBO-SPAM-Probability: X-Rspamd-Score: -0.74 / 15.00 / 15.00 X-Rspamd-Queue-Id: 1778D1829 X-Rspamd-UID: 5b19f0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 48890-done Cc: 48890-done@debbugs.gnu.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.7 (-) Hi Matthew, I validated the upgrade and applied your patch with some minor tweaks (moved pandoc to native-inputs). Thank you very much, Lars From unknown Sat Jun 14 03:53:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 05 Jul 2021 11:24:10 +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