From patchwork Thu Feb 9 02:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 46763 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 38B4B164C2; Thu, 9 Feb 2023 02:21:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 71EFA1645E for ; Thu, 9 Feb 2023 02:21:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPwYa-0005g8-I3; Wed, 08 Feb 2023 21:21:04 -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 1pPwYY-0005fi-Rn for guix-patches@gnu.org; Wed, 08 Feb 2023 21:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPwYY-0000jU-CV for guix-patches@gnu.org; Wed, 08 Feb 2023 21:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPwYY-00044P-8I for guix-patches@gnu.org; Wed, 08 Feb 2023 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61331] Update cagebreak too. References: <20230206231710.sh5pmgknkoulasvo@blackbox> In-Reply-To: <20230206231710.sh5pmgknkoulasvo@blackbox> Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61331@debbugs.gnu.org Received: via spool by 61331-submit@debbugs.gnu.org id=B61331.167590922515577 (code B ref 61331); Thu, 09 Feb 2023 02:21:02 +0000 Received: (at 61331) by debbugs.gnu.org; 9 Feb 2023 02:20:25 +0000 Received: from localhost ([127.0.0.1]:57045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPwXw-00043A-Tw for submit@debbugs.gnu.org; Wed, 08 Feb 2023 21:20:25 -0500 Received: from m12.mail.163.com ([123.126.96.234]:38880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPwXr-00042m-Dw for 61331@debbugs.gnu.org; Wed, 08 Feb 2023 21:20:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=x6/GowbV76QD4uYltyylIggA7bsjTCWKQOyZEai1qIE=; b=X9F58x824+8mg6dQyTWINio/r7bableyrLLVsjmAjUbY3DOX3PTUAGZCIKuZTQ XZLZ9uJCsbdhUtueepZGVu7kKlZdiStf6weSKvcdZ8CyAdr3bGz1+bvIP9cB2GP2 aof4j4GzMxw6nuwGZvt2EyK9E+LlKNb+rNc3NNanT+Rd0= Received: from Tumashu (unknown [218.92.14.78]) by smtp17 (Coremail) with SMTP id NdxpCgD3DmlYWORjP3y0DQ--.43052S2; Thu, 09 Feb 2023 10:20:09 +0800 (CST) From: Feng Shu Date: Thu, 09 Feb 2023 10:20:08 +0800 Message-ID: <87a61na8br.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: NdxpCgD3DmlYWORjP3y0DQ--.43052S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUOwZcDUUUU X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRRkR1GDuymAXSQAAsj 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 The below is a update version of cagebreak 2.0.1 patch From 5bf4be15d210a87270b6750ba840e2bb21bfa378 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Tue, 7 Feb 2023 11:06:06 +0800 Subject: [PATCH 1/3] gnu: cagebreak: Update to 2.0.1. * gnu/packages/wm.scm (cagebreak): Update to 2.0.1. --- gnu/packages/wm.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3cfe7b9707..8ed6642498 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -145,6 +145,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) + #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages video) @@ -2680,7 +2681,7 @@ shows a notification for the user on the screen.") (define-public cagebreak (package (name "cagebreak") - (version "1.8.0") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -2689,13 +2690,28 @@ shows a notification for the user on the screen.") (file-name (git-file-name name version)) (sha256 (base32 - "0296mnzk7qd0zvnhw716jvpp7madjsar373ixx4qcff0m0jwfrxm")))) + "0fxfmxl7p63l07lqb83q5lx16hm0rixcidghx00gp08x2yrgr4x9")))) (build-system meson-build-system) - (arguments '(#:configure-flags '("-Dxwayland=true"))) + (arguments + (list + #:configure-flags #~'("-Dxwayland=true") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-config-example + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "examples/config" + ;; Using a terminal support wayland seem to a good idea. + (("xterm") (search-input-file inputs "/bin/foot")) + ;; Guix include icecat instead of firefox. + (("firefox") "icecat")))) + (add-after 'unpack 'patch-source-paths + (lambda _ + (substitute* '("cagebreak.c" "meson.build") + (("/etc/xdg") (string-append #$output "/etc/xdg")))))))) (native-inputs (list pandoc pkg-config)) (inputs - (list libevdev pango wlroots)) + (list foot libevdev pango wlroots)) (home-page "https://github.com/project-repo/cagebreak") (synopsis "Tiling wayland compositor inspired by ratpoison") (description @@ -2724,7 +2740,7 @@ for wayland conceptually based on the X11 window manager `(#:tests? #f)) ;; no tests (home-page "https://github.com/vstakhov/libucl") (synopsis "Universal configuration language (UCL) parser") - (description "libucl implements a configuration language that is easy to + (description "libucl implements a configuration language that is easy to read and write, and compatible with JSON.") (license license:bsd-2))) -- 2.30.2