From patchwork Tue Feb 27 15:56:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 61169 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 4ABD727BBEA; Tue, 27 Feb 2024 16:06:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 AC2F327BBE2 for ; Tue, 27 Feb 2024 16:06:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rezyW-0006sY-NK; Tue, 27 Feb 2024 11:06:36 -0500 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 1rezyW-0006rx-3S for guix-patches@gnu.org; Tue, 27 Feb 2024 11:06:36 -0500 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 1rezyV-0003Yr-RY for guix-patches@gnu.org; Tue, 27 Feb 2024 11:06:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rezyv-0005fJ-OS for guix-patches@gnu.org; Tue, 27 Feb 2024 11:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69430] [PATCH 1/2] gnu: sway: Update to 1.9. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 16:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69430 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69430@debbugs.gnu.org Cc: Hilton Chain X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170904997721643 (code B ref -1); Tue, 27 Feb 2024 16:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Feb 2024 16:06:17 +0000 Received: from localhost ([127.0.0.1]:34811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rezyC-0005cu-Em for submit@debbugs.gnu.org; Tue, 27 Feb 2024 11:06:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:33336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rezy9-0005bp-KO for submit@debbugs.gnu.org; Tue, 27 Feb 2024 11:06:14 -0500 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 1rezpV-0001KM-VZ for guix-patches@gnu.org; Tue, 27 Feb 2024 10:57:18 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rezpQ-0001gf-Jd for guix-patches@gnu.org; Tue, 27 Feb 2024 10:57:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1709049414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Nc7v1QRgfSU07mSEDtOG7Xcc/8KrpQD0209vWCqNBAc=; b=t3tHy+S2ZHQ2ozq3e43J05WYS/9NRAUFL6HVAKPRQ2/UrQj/s1sSDO4XKz1aRQnVaR5qUG CrXq4Z2o3BfIsUAB/rhQYOqLdnFfVy4G2lHKY+Vhs7tkVTEmwdT9w4kF56FAS+JOGdSP3f tz8tAwaXwt4kBWYs2M37WlfG2tcJOBj6bdWWKTB9Ic6r1jOlgHnKaj1gor9+IDmUkHI6HN SWqg5HlHTrool9BwDqDyL23Ifq/CRYnx4t+Vl3SBWVQOiyFe2GvggOQH/MEptpEc53eSVU +otjCMhpsuAVuJ/MPeziV+nhd5/yXNbYbhwxw4JoWLlzAgr8T+HDAZLuxUjAdQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Tue, 27 Feb 2024 23:56:52 +0800 Message-ID: <75e2cd50e71e8b3289a8493d1db94dbfbfa1ac63.1709049313.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/wm.scm (sway): Update to 1.9. [arguments]<#:phases>: Don't hardcode path to scdoc. [inputs]: Replace wlroots-0.16 with wlroots. Change-Id: I2108e57180a91dc2873d5398dc5f6981002e1c3d --- gnu/packages/wm.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be prerequisite-patch-id: c615f2b08070db6cbe847a2bdd5b7c0aae79789b prerequisite-patch-id: fd7da036342f36a8c698f5c8975f9e48d3ade435 prerequisite-patch-id: a2c81c14423bb9858f33d7d26976e8eea61982b7 prerequisite-patch-id: e30fd25b1dc4aaaff76474153836cd48e8565eb9 prerequisite-patch-id: 1d070b26dc64ee2ec95f14c4f5fc23419f766810 prerequisite-patch-id: 03de992f0312d5f0ee3368ebc3c1fad7c955d095 prerequisite-patch-id: b330efe2b0713e30b766c3b84643df67eb1eae5d prerequisite-patch-id: a233d53e8895d3f82af872fffb2e3858f44ceb23 prerequisite-patch-id: a2b6bd60bc05d7b5a75f15a06b1b614afd6a7033 prerequisite-patch-id: 9d60e5fdd3f1418caf15820650dd8c090c291c2b prerequisite-patch-id: 46d4907ae64a79ec05a25ffc392868139c6d6e0f diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ae8213ddae..90d61d1d86 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1757,7 +1757,7 @@ (define-public wlroots-0.16 (define-public sway (package (name "sway") - (version "1.8.1") + (version "1.9") (source (origin (method git-fetch) @@ -1766,7 +1766,7 @@ (define-public sway (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y7brfrsjnm9gksijgnr6zxqiqvn06mdiwsk5j87ggmxazxd66av")))) + (base32 "1n36vgpi4bg2gkiq4fam4khly1z9bjinmjclzq5vfx0z8h7a5bzz")))) (build-system meson-build-system) (arguments `(;; elogind is propagated by wlroots -> libseat @@ -1781,11 +1781,6 @@ (define-public sway (("strdup..swaybg..") (string-append "strdup(\"" (assoc-ref inputs "swaybg") "/bin/swaybg\")"))) - ;; Hardcode path to scdoc. - (substitute* "meson.build" - (("scdoc.get_pkgconfig_variable..scdoc..") - (string-append "'" (assoc-ref inputs "scdoc") - "/bin/scdoc'"))) #t))))) (inputs (list basu cairo @@ -1798,7 +1793,7 @@ (define-public sway pcre2 swaybg wayland - wlroots-0.16)) + wlroots)) (native-inputs (cons* linux-pam mesa pkg-config scdoc wayland-protocols (if (%current-target-system)