From patchwork Tue Mar 12 14:26:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ignas_Lap=C4=97nas?= X-Patchwork-Id: 61690 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 0D2BD27BBE9; Tue, 12 Mar 2024 16:27: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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 04D3127BBE2 for ; Tue, 12 Mar 2024 16:27:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk4yZ-0002a0-MD; Tue, 12 Mar 2024 12:27:39 -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 1rk4yR-0002Y9-MR for guix-patches@gnu.org; Tue, 12 Mar 2024 12:27:32 -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 1rk4yQ-0001qn-0j for guix-patches@gnu.org; Tue, 12 Mar 2024 12:27:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rk4yy-00005A-AL for guix-patches@gnu.org; Tue, 12 Mar 2024 12:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69743] [PATCH] update grimshot package definition References: <7f2ba732c3b7dd12d937e70a5f643a09ac5bfa6d.1710237367.git.ignas@lapenas.dev> In-Reply-To: <7f2ba732c3b7dd12d937e70a5f643a09ac5bfa6d.1710237367.git.ignas@lapenas.dev> Resent-From: Ignas =?utf-8?q?Lap=C4=97nas?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 16:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69743 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69743@debbugs.gnu.org Cc: Ignas =?utf-8?q?Lap=C4=97nas?= Received: via spool by 69743-submit@debbugs.gnu.org id=B69743.171026085632696 (code B ref 69743); Tue, 12 Mar 2024 16:28:04 +0000 Received: (at 69743) by debbugs.gnu.org; 12 Mar 2024 16:27:36 +0000 Received: from localhost ([127.0.0.1]:43493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk4yW-0008VG-9P for submit@debbugs.gnu.org; Tue, 12 Mar 2024 12:27:36 -0400 Received: from tritonas.serveriai.lt ([194.135.87.87]:45408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk370-000244-8v for 69743@debbugs.gnu.org; Tue, 12 Mar 2024 10:28:15 -0400 Received: from [88.119.78.42] (helo=localhost.localdomain) by tritonas.serveriai.lt with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rk36P-0002dj-UM; Tue, 12 Mar 2024 16:27:37 +0200 From: Ignas =?utf-8?q?Lap=C4=97nas?= Date: Tue, 12 Mar 2024 16:26:51 +0200 Message-ID: <3e0169510de5f325bc1834b87fe9d1514d72e84e.1710253611.git.ignas@lapenas.dev> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Sender: ignas@lapenas.dev X-Mailman-Approved-At: Tue, 12 Mar 2024 12:27:27 -0400 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 Issue: https://issues.guix.gnu.org/69667 Grimshot was dropped from sway. https://github.com/swaywm/sway/issues/7405 The contrib was moved to: https://github.com/OctopusET/sway-contrib Package definition updated accordingly. Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a --- gnu/packages/wm.scm | 58 +++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 26 deletions(-) base-commit: 4003c60abf7a6e59e47cc2deb9eef2f104ebb994 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index edbb3096b8..bb9926d53a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -3524,33 +3524,36 @@ (define-public avizo (define-public grimshot (package - (inherit sway) (name "grimshot") - (source (origin - (inherit (package-source sway)) - (snippet #~(delete-file "contrib/grimshot.1")))) + (version "1.9-contrib.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OctopusET/sway-contrib") + (commit version))) + (sha256 + (base32 "16fa8l81zjy25nsky1i525hb7zjprqz74mbirm9b76pvksschdv5")))) (build-system copy-build-system) (arguments - (list #:install-plan #~`(("grimshot" "bin/") - ("grimshot.1" "share/man/man1/")) - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "contrib"))) - (add-after 'chdir 'patch-script-dependencies - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "grimshot" - (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b" - _ binary) - (search-input-file - inputs (string-append "bin/" binary)))))) - (add-after 'patch-script-dependencies 'build-man-page - (lambda _ - (with-input-from-file "grimshot.1.scd" - (lambda _ - (with-output-to-file "grimshot.1" - (lambda _ - (invoke "scdoc")))))))))) + (list + #:install-plan #~`(("grimshot" "bin/") + ("grimshot.1" "share/man/man1/")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-script-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "grimshot" + (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b" + _ binary) + (search-input-file inputs + (string-append "bin/" binary)))))) + (add-after 'patch-script-dependencies 'build-man-page + (lambda _ + (with-input-from-file "grimshot.1.scd" + (lambda _ + (with-output-to-file "grimshot.1" + (lambda _ + (invoke "scdoc")))))))))) (native-inputs (list scdoc)) (inputs (list coreutils grim @@ -3559,11 +3562,14 @@ (define-public grimshot slurp sway wl-clipboard)) + (home-page "https://github.com/OctopusET/sway-contrib") (synopsis "Screenshot utility for the Sway window manager") - (description "Grimshot is a screenshot utility for @code{sway}. It provides + (description + "Grimshot is a screenshot utility for @code{sway}. It provides an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing the screenshot either directly to the clipboard using @code{wl-copy} or to a -file."))) +file.") + (license license:expat))) (define-public wld (let ((commit "6586736176ef50a88025abae835e29a7ca980126")