From patchwork Sun Jul 28 04:34:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 66533 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 A1B6527BBEA; Sun, 28 Jul 2024 05:35:46 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 60D4C27BBE9 for ; Sun, 28 Jul 2024 05:35:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXvct-0000MT-Ge; Sun, 28 Jul 2024 00:35:20 -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 1sXvcS-0000KO-8T for guix-patches@gnu.org; Sun, 28 Jul 2024 00:34:57 -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 1sXvcR-0000XN-Vj for guix-patches@gnu.org; Sun, 28 Jul 2024 00:34:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=BI7ypQvkKaC9kBFCRbuWWxgQS6Um6VtI8ZwEP7XfYGE=; b=OzdTUJwa4g67zdSCswv09Y6FjnmS6e4AX9esS/a09scn4WNDns9UF27Z0VDS79wKlJpq66pkWmrZfBjhosGU4lzbrTtIv6hRR201Q0ILzvg/F5ZjKj7ipaBqICqd7nOJCVrSPjbHyf75jLnF+kjwVy6iKBI5F3w2nlkLXcf81XEKECm5ZwR0npUcRxVO+8s8qgoekLmWF1Qf/zCNTqHS3fj3gu3wHa3PY4524qJaWJ4vO7wPDnIwxlAHx8GcL3ASnDPgT0bXS8dbe4SYoawuj/ffVh3O4FzrUB54BNrHYY4JdjoWudrHJ2h8PCGBHgtrCR8FAmPnoBK2feTj6cEFQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXvcc-0003Yi-LH for guix-patches@gnu.org; Sun, 28 Jul 2024 00:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72330] [PATCH] gnu: xpra: Update to 6.1.0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jul 2024 04:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72330@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172214128513649 (code B ref -1); Sun, 28 Jul 2024 04:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2024 04:34:45 +0000 Received: from localhost ([127.0.0.1]:42566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXvcK-0003Y5-Ma for submit@debbugs.gnu.org; Sun, 28 Jul 2024 00:34:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:44516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXvcG-0003Xn-Gt for submit@debbugs.gnu.org; Sun, 28 Jul 2024 00:34:41 -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 1sXvc4-0000GT-Mv for guix-patches@gnu.org; Sun, 28 Jul 2024 00:34:28 -0400 Received: from mail-yb1-xb31.google.com ([2607:f8b0:4864:20::b31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sXvc2-0000Vf-Ow for guix-patches@gnu.org; Sun, 28 Jul 2024 00:34:28 -0400 Received: by mail-yb1-xb31.google.com with SMTP id 3f1490d57ef6-dfef5980a69so1069783276.3 for ; Sat, 27 Jul 2024 21:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722141264; x=1722746064; 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=BI7ypQvkKaC9kBFCRbuWWxgQS6Um6VtI8ZwEP7XfYGE=; b=LkN6h91URdlqmi3izH+u4tezsFh5HQMe2/k4jOd/Qk0B6vyxVr4r3tjvKJsN3RGQrw WeSi9bpmZfe2tppm0EqOHF5jr1p0RxTu67pzCYGPFvx0R/mCzVbgJgdgUgdkRECMviDQ ZnfHtj3xAEQoXZ+FXmipl9Uz/ZKnJNePSHqJbhNP3mjA8XmQ97a79u8nFWXSPo7mlQ0b pouPI3agTcMfFiAlekz49HKVjsS3FA0Wwgp8QZihO3Dx+p/lBUMjLin7jACiuswlYm4X RHH5APciE1kqin/eoN+GCelc41eE8INARGwxvhnHK1HFtKCVyAHY+3qMqF5K6Htnqdpn HPGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722141264; x=1722746064; 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=BI7ypQvkKaC9kBFCRbuWWxgQS6Um6VtI8ZwEP7XfYGE=; b=kJH9FWUfhTUpuwut66rBZ5XnU57ahmttgbxcnWfrotvIIByk6uHcC9C/Ty+guxMVB+ pDrv+WXy0ysuWYNEF15f0YDQlQoU654FhCTQ31HbeMgzLe2ft1l1N9dFaYzlIIvb+odj 51nSzEr4Uemw3A+W9pnNr0lThr1ARMufQ2MmxzAF5IWM06BOMPa8bDSAvqCbyhHcGLRe 29ALBTN2pT1Dfam7nxXvDm96ingMv7RAGDq8Bttc0z2GHh3XnNgPqOwxzAfbp+HzFZdN UrlxS6RNNoXJCljj0kyDs44YPat1PhlUQsdAQGCUhfou/8b5JTjDumnKiqKu0K/kQI06 UkjA== X-Gm-Message-State: AOJu0YzWjIn1SJHFL9EoVTXL78DNhZqCAaZzSbktCiJU2rcF+ESzmYmD 00TEORuQcjaMN6ceN8GvUdSC3l8Y2ZFY9nDIUqq4n/kTp4OeuqMPCPo4WA== X-Google-Smtp-Source: AGHT+IGreTScoYXL9CZElcSoM0B8wS7Xih/TxTkSMQKT7gL/u2Cb81hB47MqhufmsYIxWe8WbVosdg== X-Received: by 2002:a05:6902:70d:b0:e08:655c:aefb with SMTP id 3f1490d57ef6-e0b5445dbb5mr4683179276.13.1722141264105; Sat, 27 Jul 2024 21:34:24 -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 98e67ed59e1d1-2cf28ae2d51sm6023364a91.0.2024.07.27.21.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jul 2024 21:34:23 -0700 (PDT) From: Andy Tai Date: Sat, 27 Jul 2024 21:34:19 -0700 Message-Id: <7fb3e4467339bb60ccf54eb1ad9ae90afb1fc725.1722141217.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::b31; envelope-from=lichengtai@gmail.com; helo=mail-yb1-xb31.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xorg.scm (xpra): Update to 6.1.0. * gnu/packages/patches/xpra-6.0-install_libs.patch: Update for xpra 6.1.0. Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de --- gnu/packages/patches/xpra-6.0-install_libs.patch | 10 +++++----- gnu/packages/xorg.scm | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a diff --git a/gnu/packages/patches/xpra-6.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch index c608b519f4..0ec2aee288 100644 --- a/gnu/packages/patches/xpra-6.0-install_libs.patch +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch @@ -4,19 +4,19 @@ This workaround for Gentoo interferes with our use of --no-compile during the 'install stage. diff --git a/setup.py b/setup.py -index 4f066fa8bf..14a9ed65ed 100755 +index be7a3758e8..28dc1be191 100755 --- a/setup.py +++ b/setup.py -@@ -760,8 +760,6 @@ if modules_ENABLED: +@@ -953,8 +953,6 @@ if modules_ENABLED: # Utility methods for building with Cython - def do_add_cython_ext(*args, **kwargs): + def do_add_cython_ext(*args, **kwargs) -> None: - 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: -@@ -1971,9 +1969,6 @@ else: +@@ -2175,9 +2173,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] @@ -26,7 +26,7 @@ index 4f066fa8bf..14a9ed65ed 100755 print(f" root_prefix={root_prefix!r}") build_xpra_conf(root_prefix) -@@ -2116,13 +2111,6 @@ else: +@@ -2320,13 +2315,6 @@ else: if uinput_ENABLED: add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6b953ef152..bdce6174ff 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6158,7 +6158,7 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "6.0.2") + (version "6.1.0") (source (origin (method git-fetch) @@ -6167,7 +6167,7 @@ (define-public xpra (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "176qxrksgr07jhrlny3zxybnvf091kxkfmfnv9ci3h2k1nbwqh2x")) + (base32 "1x1ld2p3q47irqq6p1b3rd9ffbi7kvgxyvfmgi0skfin17b2aqx4")) (patches (search-patches "xpra-6.0-systemd-run.patch" "xpra-6.0-install_libs.patch")))) (build-system python-build-system)