From patchwork Sat Aug 3 04:37:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 66624 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 9021927BBEA; Sat, 3 Aug 2024 05:39:23 +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 35FE727BBE2 for ; Sat, 3 Aug 2024 05:39:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sa6Xe-0008MH-VE; Sat, 03 Aug 2024 00:38:54 -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 1sa6XX-0008Lz-5R for guix-patches@gnu.org; Sat, 03 Aug 2024 00:38:47 -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 1sa6XT-0003B7-6t for guix-patches@gnu.org; Sat, 03 Aug 2024 00:38:43 -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:In-Reply-To:References:Subject; bh=tcBXusCLH6wvG9a7s1sI7xLXZVnUEvhPNNDKrvzbitk=; b=jtJhgR4Droo+530j4CCug5LcVUZxngNFh3pGHPdt/F2vK32sr5c7czv79F3/uB67y9sFYOSL8cSn90NIdTS2NGKwuEfLOgn3/HMs56lYuzwYyATdstxghf6T27ZP51WifR3ncNO09GVNtx6y+Ex0ukH+AUaxFx8lDPc21LuPOfjjgqWr+2+HfrNwqJQOwsxaDSTx2iPJogfCCo2tQm9yMsIK/EEwZBGa8cXVGHobmHVdAR2dnM31Gl9CpjdpycSIJUqd+6nFHwUZueH6wJgP3CZNcACIhxZmKAh4kCqFsGLdfMThj+Sv90sIS7Xl/ZuasCi0NzPF+9l6JU3meO6Iog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sa6Xl-00084e-TM for guix-patches@gnu.org; Sat, 03 Aug 2024 00:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72330] [PATCH v2] gnu: xpra: Update to 6.1.0 References: <7fb3e4467339bb60ccf54eb1ad9ae90afb1fc725.1722141217.git.atai@atai.org> In-Reply-To: <7fb3e4467339bb60ccf54eb1ad9ae90afb1fc725.1722141217.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Aug 2024 04:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72330@debbugs.gnu.org, zhengjunjie@iscas.ac.cn Cc: Andy Tai Received: via spool by 72330-submit@debbugs.gnu.org id=B72330.172265992831015 (code B ref 72330); Sat, 03 Aug 2024 04:39:01 +0000 Received: (at 72330) by debbugs.gnu.org; 3 Aug 2024 04:38:48 +0000 Received: from localhost ([127.0.0.1]:53963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa6XY-00084A-AW for submit@debbugs.gnu.org; Sat, 03 Aug 2024 00:38:48 -0400 Received: from mail-pf1-f169.google.com ([209.85.210.169]:59663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa6XW-00083j-Ab for 72330@debbugs.gnu.org; Sat, 03 Aug 2024 00:38:47 -0400 Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-70eec5f2401so5971670b3a.3 for <72330@debbugs.gnu.org>; Fri, 02 Aug 2024 21:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722659841; x=1723264641; 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=tcBXusCLH6wvG9a7s1sI7xLXZVnUEvhPNNDKrvzbitk=; b=g57M/ejS4DgZt6xx8Z9A2UvUtBR+ukAorI1Jq5012UVRCJ3kpU+AI/Hxzqwye9Sp2+ ayH9mV3j8fO7KDbO8m3vatzwdcLz+Et9BN7m6CCGPjy9Yfo1q2s4ykIxExVgcnLPSS4+ u8yPOMeUZ6Yrlej1j+5trCp5wfb3THN3yWz9KZ6+w/uTlm1CDFfoPpd3+tw9HBNCVt1b kghlidlN1flLZf5pZSPnWpEV3rTj1MCpMdgyMIu5z74zr+K4RhROFBkIPU/QdkEBCqgP SONG4LB28UJnhvoeasbIhq6o0e19jarg8qcFIJUJWyU/H76Anfv0IWOXICkishpp9vFP W85A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722659841; x=1723264641; 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=tcBXusCLH6wvG9a7s1sI7xLXZVnUEvhPNNDKrvzbitk=; b=vAybvg+UOWgkiBq/j6ue4uCxlhrjui9TpyANqHk2mmAXSDUW/HlmL9mX/jRpJgE0HS bMcEebHPCDBOYBJJnMgOLMP8h73vh8QTkSo6TqUBFgOxEEmC61a1c2FpQh1lqNB5qdL9 P8E6jipCSBA1yOvxlBBQJGekA7JAVHi1cpbWGCgN87ljpLLZo9w0vUx1NO8ziBgDFHy1 c97Ovih0jPoALtte4VMP+to/Zm/fzBDvFI5JSo7aNwmO83obgRTRpPBFSFxvUjkdxW8K VYnpkQQwkqQJFZ+OhfncCM5vDkUHouQARfOFBkN7R7QITUGOSTIldnZiWBl9xy4kOUlV ivlQ== X-Gm-Message-State: AOJu0Yyktio/YI+og/xStJl5i5iUxxQNVVwBVuKVYOu0rJ/++1ULBGIJ fn/fC75VL99S+h0HvOJ+6khaVaeBW4QQ2vMiPfYj/fx6ymziPvAqTw1LNw== X-Google-Smtp-Source: AGHT+IGLtu2bSn32M3YGOqXBBdNMiUq/tHqdHYpSXEO3m6NaL7wsfDf/QIF9knzKcoJ0j/2hEAZ7Xg== X-Received: by 2002:a05:6a21:998d:b0:1c0:bf35:ef61 with SMTP id adf61e73a8af0-1c699578bb2mr8788009637.2.1722659840665; Fri, 02 Aug 2024 21:37:20 -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-2cfdc4cf660sm5973652a91.42.2024.08.02.21.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 21:37:20 -0700 (PDT) From: Andy Tai Date: Fri, 2 Aug 2024 21:37:17 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 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 * gnu/packages/xorg.scm (xpra): Update to 6.1.0. [source](origin): Update patch file name. * gnu/packages/patches/xpra-6.0-install_libs.patch: Delete. * gnu/packages/patches/xpra-6.1-install_libs.patch: New file. * gnu/local.mk: Unregister deleted file and register new file. Change-Id: I38dab99fbb369ab7e8daf2795dc37aa1a36a63de --- gnu/local.mk | 2 +- ...-install_libs.patch => xpra-6.1-install_libs.patch} | 10 +++++----- gnu/packages/xorg.scm | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename gnu/packages/patches/{xpra-6.0-install_libs.patch => xpra-6.1-install_libs.patch} (90%) base-commit: b20956651a53a8f23828fdeb6945e1a31e6997a8 diff --git a/gnu/local.mk b/gnu/local.mk index 6d2b14e72d..28953b76de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2266,7 +2266,7 @@ dist_patch_DATA = \ %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-6.0-systemd-run.patch \ - %D%/packages/patches/xpra-6.0-install_libs.patch \ + %D%/packages/patches/xpra-6.1-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-6.0-install_libs.patch b/gnu/packages/patches/xpra-6.1-install_libs.patch similarity index 90% rename from gnu/packages/patches/xpra-6.0-install_libs.patch rename to gnu/packages/patches/xpra-6.1-install_libs.patch index c608b519f4..0ec2aee288 100644 --- a/gnu/packages/patches/xpra-6.0-install_libs.patch +++ b/gnu/packages/patches/xpra-6.1-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..6825474a6a 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,9 +6167,9 @@ (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")))) + "xpra-6.1-install_libs.patch")))) (build-system python-build-system) (inputs (list bash-minimal ; for wrap-program