From patchwork Mon Feb 13 10:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 46915 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 7A87016663; Mon, 13 Feb 2023 10:46:23 +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 7D6D91665B for ; Mon, 13 Feb 2023 10:46:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRWLg-0000cn-F8; Mon, 13 Feb 2023 05:46:16 -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 1pRWLU-0000VR-Oq for guix-patches@gnu.org; Mon, 13 Feb 2023 05:46:11 -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 1pRWLS-0000Ld-0v for guix-patches@gnu.org; Mon, 13 Feb 2023 05:46:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRWLR-0002sw-LD for guix-patches@gnu.org; Mon, 13 Feb 2023 05:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61056] [PATCH v8 1/2] gnu: Add jwm. References: <20230125111514.5194-1-tumashu@163.com> In-Reply-To: <20230125111514.5194-1-tumashu@163.com> Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Feb 2023 10:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61056@debbugs.gnu.org Received: via spool by 61056-submit@debbugs.gnu.org id=B61056.167628514311062 (code B ref 61056); Mon, 13 Feb 2023 10:46:01 +0000 Received: (at 61056) by debbugs.gnu.org; 13 Feb 2023 10:45:43 +0000 Received: from localhost ([127.0.0.1]:47740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRWL8-0002sM-Ln for submit@debbugs.gnu.org; Mon, 13 Feb 2023 05:45:43 -0500 Received: from m12.mail.163.com ([220.181.12.198]:37254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRWL4-0002s6-Vx for 61056@debbugs.gnu.org; Mon, 13 Feb 2023 05:45:41 -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=PAcillfwDqhrtps5q4srBygw74Al8pJIp3nyeZj9fyQ=; b=L/bwqhwh9IW1WE/ZHiibj7Nyh3qq0Mw4hZEGFYLBW+rqhMNspBKZ8BLbhUzwYb jPsOL+qj8Oga6CyVJFYtXAM3fMGrJ2rlOyec8dapFUl8s8eZndbGLLpi4OAKCLrD ae719zXYa/zQA/Dhnq/NinVtqsk1Yo3cIViD8skORtCgM= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g4-4 (Coremail) with SMTP id _____wCXn4_AFOpjPNC4Dw--.15392S2; Mon, 13 Feb 2023 18:45:20 +0800 (CST) From: Feng Shu Date: Mon, 13 Feb 2023 18:45:20 +0800 Message-ID: <874jrpq1xb.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: _____wCXn4_AFOpjPNC4Dw--.15392S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUYSdkUUUUU X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiHQoV1GI68+uszgAAs0 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 -- From 455305ffd5f4e0bca239c8fc0f65f0a1f36ba8d0 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Sat, 11 Feb 2023 10:55:47 +0800 Subject: [PATCH v8 1/2] gnu: Add jwm. * gnu/packages/wm.scm (jwm): New variable. --- gnu/packages/wm.scm | 107 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 37fbf88e99..14dc3a0988 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2904,6 +2904,113 @@ read and write, and compatible with JSON.") capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) +(define-public jwm + (package + (name "jwm") + (version "2.4.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/joewing/jwm/releases/download/" + "v" version "/jwm-" version ".tar.xz")) + (sha256 + (base32 + "1av7r9sp26r5l74zvwdmyyyzav29mw5bafihp7y33vsjqkh4wfzf")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no check target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-example.jwmrc + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "example.jwmrc" + ;; Ignore existing menus in example.jwmrc. + (("") " -->") + ;; Adjust xterm path in terminal menu item. + ((">xterm") + (string-append + ">" (search-input-file inputs "/bin/xterm") + "")) + ;; Replace xscreensaver with xlock, which has been configured + ;; well by desktop-service. + (("xscreensaver-command -lock") "xlock") + ;; Adjust icons search paths. + (("/usr/local/share/jwm") + (string-append #$output "/share/jwm")) + (("/usr/local/share/icons") + "/run/current-system/profile/share/icons") + ;; Include menu created by mjwm command. + (("" all) + (string-append + all "\n " + "" + (search-input-file inputs "/bin/mjwm") + " --iconize --no-backup " + " --output-file $HOME/.jwmrc-mjwm-guix" + "\n " + "" + "$HOME/.jwmrc-mjwm-guix" + "\n"))))) + (add-after 'install 'install-tango-icon-files + ;; Copy icon files used by example.jwm to share/jwm dir, this way + ;; may be better than adding tango-icon-theme to inputs. + (lambda* (#:key inputs #:allow-other-keys) + (let ((icon-dir (search-input-directory + inputs "share/icons/Tango/scalable")) + (icon-install-dir (string-append #$output "/share/jwm"))) + (for-each + (lambda (icon) + (for-each (lambda (icon-file) + (install-file icon-file icon-install-dir)) + (find-files icon-dir (string-append "^" icon "\\.svg$")))) + '("calc" "email" "exit" "folder" "font" "help-browser" + "image" "info" "lock" "reload" "sound" + "system-file-manager" "utilities-terminal" + "web-browser" "gnome-settings" "applications-.*")) + (with-directory-excursion icon-install-dir + ;; tango-icon-theme have no applications-science icon. + (copy-file "help-browser.svg" "applications-science.svg"))))) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/jwm.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=jwm~@ + Comment=Joe's Window Manager~@ + Exec=~a/bin/jwm~@ + Type=XSession~%" out))))))))) + (native-inputs (list pkg-config tango-icon-theme)) + (inputs + (list cairo + libjpeg-turbo + libpng + librsvg + libxext + libxinerama + libxmu + libxpm + libxrandr + libxt + mjwm + pango + xterm)) + (home-page "http://joewing.net/projects/jwm") + (synopsis "Joe's Window Manager") + (description + "JWM is a light-weight window manager for the X11 Window System. it is +written in C and uses only Xlib at a minimum. Because of its small footprint, +it makes a good window manager for older computers and less powerful systems, +such as the Raspberry Pi, though it is perfectly capable of running on modern +systems.") + (license license:expat))) + (define-public devour (package (name "devour") -- 2.30.2