From patchwork Fri Jan 13 23:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gabriel Wicki X-Patchwork-Id: 46101 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 9798427BBED; Fri, 13 Jan 2023 23:41:14 +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.9 required=5.0 tests=BAYES_00,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 DD47A27BBE9 for ; Fri, 13 Jan 2023 23:41:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGTeZ-0001Kj-8N; Fri, 13 Jan 2023 18:40:07 -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 1pGTeW-0001IM-Q0 for guix-patches@gnu.org; Fri, 13 Jan 2023 18:40:04 -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 1pGTeW-0003WK-Cg for guix-patches@gnu.org; Fri, 13 Jan 2023 18:40:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGTeW-0000Fp-8M for guix-patches@gnu.org; Fri, 13 Jan 2023 18:40:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60797] Update i3 and deprecate i3-gaps Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 23:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60797 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60797@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1673653181875 (code B ref -1); Fri, 13 Jan 2023 23:40:04 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 23:39:41 +0000 Received: from localhost ([127.0.0.1]:52712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGTe8-0000E3-LS for submit@debbugs.gnu.org; Fri, 13 Jan 2023 18:39:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:45052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGTe6-0000Ds-PK for submit@debbugs.gnu.org; Fri, 13 Jan 2023 18:39:39 -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 1pGTe6-0001GJ-ET for guix-patches@gnu.org; Fri, 13 Jan 2023 18:39:38 -0500 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGTe3-0003Ic-2q for guix-patches@gnu.org; Fri, 13 Jan 2023 18:39:37 -0500 Received: from blackbox (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id 67CE2401A7 for ; Sat, 14 Jan 2023 00:39:14 +0100 (CET) Date: Sat, 14 Jan 2023 00:39:11 +0100 From: Gabriel Wicki Message-ID: <20230113233911.tz7hoviergbndrnc@blackbox> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=129.132.2.15; envelope-from=gabriel@erlikon.ch; helo=chimborazo.ee.ethz.ch X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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 Hello! i3-wm has been updated and i3-gaps has been merged into mainline i3. The following patch reflects these circumstances. Thanks for merging, g P.S. The diff is this giant because `guix style` wanted it to be. I'm not 100% sure if this is really appropriate. From e596cbb4ce663efa3239f83edaba24e0e0da9e4f Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sat, 14 Jan 2023 00:00:18 +0100 Subject: [PATCH] gnu: i3: Update to 4.22 * gnu/packages/wm.scm (i3): Update to 4.22. (i3-gaps): Deprecate package. --- gnu/packages/wm.scm | 127 +++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a13467663e..6b97481a37 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2022 Fredrik Salomonsson ;;; Copyright © 2022 ( ;;; Copyright © 2022 zamfofex +;;; Copyright © 2023 Gabriel Wicki ;;; ;;; This file is part of GNU Guix. ;;; @@ -309,58 +310,60 @@ (define-public i3status (define-public i3-wm (package (name "i3-wm") - (version "4.20.1") + (version "4.22") (source (origin (method url-fetch) - (uri (string-append "https://i3wm.org/downloads/i3-" - version ".tar.xz")) + (uri (string-append "https://i3wm.org/downloads/i3-" version + ".tar.xz")) (sha256 (base32 - "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93")))) + "0jrya4rhh46sivlmqaqc4n9abpp1yn1ajhi616gn75cxwl8rjqr8")))) (build-system meson-build-system) (arguments - `(;; The test suite requires the unpackaged Xephyr X server. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'patch-session-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (i3 (string-append out "/bin/i3")) - (i3-with-shmlog (string-append out "/bin/i3-with-shmlog"))) - (substitute* (string-append out "/share/xsessions/i3.desktop") - (("Exec=i3") (string-append "Exec=" i3))) - (substitute* (string-append out "/share/xsessions/i3-with-shmlog.desktop") - (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog))) - #t)))))) - (inputs - (list libxcb - xcb-util - xcb-util-cursor - xcb-util-keysyms - xcb-util-wm - xcb-util-xrm - libxkbcommon - libev - yajl - xmlto - perl-pod-simple - libx11 - pcre - startup-notification - pango - cairo)) - (native-inputs - (list which - perl - pkg-config - asciidoc - ;; For building the documentation. - libxml2 - docbook-xsl)) + `( ;The test suite requires the unpackaged Xephyr X server. + #:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'install 'patch-session-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (i3 (string-append out "/bin/i3")) + (i3-with-shmlog (string-append out + "/bin/i3-with-shmlog"))) + (substitute* (string-append out + "/share/xsessions/i3.desktop") + (("Exec=i3") + (string-append "Exec=" i3))) + (substitute* (string-append out + "/share/xsessions/i3-with-shmlog.desktop") + (("Exec=i3-with-shmlog") + (string-append "Exec=" i3-with-shmlog))) #t)))))) + (inputs (list libxcb + xcb-util + xcb-util-cursor + xcb-util-keysyms + xcb-util-wm + xcb-util-xrm + libxkbcommon + libev + yajl + xmlto + perl-pod-simple + libx11 + pcre2 + startup-notification + pango + cairo)) + (native-inputs (list which + perl + pkg-config + asciidoc + ;; For building the documentation. + libxml2 + docbook-xsl)) (home-page "https://i3wm.org/") (synopsis "Tiling window manager") - (description "i3 is a tiling X11 window manager that dynamically manages + (description + "i3 is a tiling X11 window manager that dynamically manages tiled, stacked, and tabbed window layouts. i3 primarily targets advanced users. Windows are managed manually and organised @@ -369,42 +372,12 @@ (define-public i3-wm i3 uses a plain-text configuration file, and can be extended and controlled from many programming languages.") - (properties - `((upstream-name . "i3") - (release-monitoring-url . "https://i3wm.org/downloads"))) + (properties `((upstream-name . "i3") + (release-monitoring-url . "https://i3wm.org/downloads"))) (license license:bsd-3))) (define-public i3-gaps - (package - (inherit i3-wm) - (name "i3-gaps") - (version "4.20.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Airblader/i3") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0g0qmv2gpv9qbhj9h5f4c4vfs6ndzq2rblgx9md85iharwp5sbb9")))) - (home-page "https://github.com/Airblader/i3") - (synopsis "Tiling window manager with gaps") - (description - "i3-gaps is a fork of i3wm, a tiling window manager -for X11. It is kept up to date with upstream, adding a few additional -features such as gaps between windows. - -i3 is a tiling X11 window manager that dynamically manages tiled, stacked, -and tabbed window layouts. - -i3 primarily targets advanced users. Windows are managed manually and -organised inside containers, which can be split vertically or horizontally, -and optionally resized. - -i3 uses a plain-text configuration file, and can be extended and controlled -from many programming languages.") - (license license:bsd-3))) + (deprecated-package "i3-gaps" i3-wm)) (define-public i3lock (package