From patchwork Sat Feb 11 02:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 46796 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 3B8511661A; Sat, 11 Feb 2023 02:31:17 +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=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 1ED8616615 for ; Sat, 11 Feb 2023 02:31:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQffM-00073q-Ko; Fri, 10 Feb 2023 21:31: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 1pQffK-00073C-UG for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31: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 1pQffK-0006So-JU for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQffK-0008N4-7y for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61056] [PATCH v5 1/2] gnu: Add jwm. References: <20230125111514.5194-1-tumashu@163.com> In-Reply-To: <20230125111514.5194-1-tumashu@163.com> Resent-From: tumashu@163.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 02:31:02 +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 Cc: Feng Shu Received: via spool by 61056-submit@debbugs.gnu.org id=B61056.167608265932162 (code B ref 61056); Sat, 11 Feb 2023 02:31:02 +0000 Received: (at 61056) by debbugs.gnu.org; 11 Feb 2023 02:30:59 +0000 Received: from localhost ([127.0.0.1]:38413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQffG-0008Mf-Sf for submit@debbugs.gnu.org; Fri, 10 Feb 2023 21:30:59 -0500 Received: from m12.mail.163.com ([123.126.96.234]:42896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQffE-0008MK-7W for 61056@debbugs.gnu.org; Fri, 10 Feb 2023 21:30:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=K3XxF cQt7gE70NxDiCkjI2hbfm5xMl5Zxcol0LmTZJs=; b=jI8d7MtDHLIQ2ZHxZRFvI LEB/uBBvI0lAnPuKWdZ+6ltArdDQvTa3/qLk+V0mE88yyV0VcxeSS3NC4QcnCtuD gIRHaE1z66JwTshAn/YneXVmmon7P1BrIxw2vmgBvA8WyJO9m4QdWC7QF4HYY3wN CRG/7pR7F2wwnS1hAJX0MQ= Received: from localhost.localdomain (unknown [114.237.132.223]) by smtp20 (Coremail) with SMTP id H91pCgCns7_R_eZj_TmyDg--.62391S2; Sat, 11 Feb 2023 10:30:45 +0800 (CST) From: tumashu@163.com Date: Sat, 11 Feb 2023 10:30:38 +0800 Message-Id: <20230211023039.13181-1-tumashu@163.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CM-TRANSID: H91pCgCns7_R_eZj_TmyDg--.62391S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCryUJF4rXFWxJw1kWF13CFg_yoWrWF1fpF s09r4fKa48XrnayrWSgF42934YgFZ5Ar4Svw1xZ3s2yw45KF1Ivry3KFW5uF1xG3W7Cay3 Xw48XrW5ur4UK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRFeH-UUUUU= X-Originating-IP: [114.237.132.223] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiHRYT1GI688-BWAAAsx 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: Feng Shu * gnu/packages/wm.scm (jwm): New variable. --- gnu/packages/wm.scm | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2fd70af07f..0881ba40d5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2764,6 +2764,110 @@ (define-public hikari 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$")))) + '("applications-.*" "calc" "email" "exit" "folder" + "font" "gnome-settings" "image" "info" "lock" + "reload" "sound" "system-file-manager" + "utilities-terminal" "web-browser" ))))) + (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") From patchwork Sat Feb 11 02:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 46797 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 37D5E1661C; Sat, 11 Feb 2023 02:31:32 +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 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 A937F16618 for ; Sat, 11 Feb 2023 02:31:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQffO-000748-GN; Fri, 10 Feb 2023 21:31:06 -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 1pQffL-00073P-9x for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31: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 1pQffK-0006T2-OY for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQffK-0008NB-K1 for guix-patches@gnu.org; Fri, 10 Feb 2023 21:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61056] [PATCH v5 2/2] gnu: Add mjwm. Resent-From: tumashu@163.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 02:31:02 +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 Cc: Feng Shu Received: via spool by 61056-submit@debbugs.gnu.org id=B61056.167608265932170 (code B ref 61056); Sat, 11 Feb 2023 02:31:02 +0000 Received: (at 61056) by debbugs.gnu.org; 11 Feb 2023 02:30:59 +0000 Received: from localhost ([127.0.0.1]:38415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQffH-0008Mh-Cq for submit@debbugs.gnu.org; Fri, 10 Feb 2023 21:30:59 -0500 Received: from m12.mail.163.com ([123.126.96.234]:43074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQffE-0008MM-Ri for 61056@debbugs.gnu.org; Fri, 10 Feb 2023 21:30:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=NcVHB teObsPDm28g7gcPCTqTCyiQqr7olG+DKtEd7d0=; b=JMBuWGgGDl3Ni1S7QEkH6 vwsMl6DkTDOyllZ88YUjzXYk2Ogo9BQEOWFT5msTtmjSWfsGjs3MoMlJyMLnHnW1 NlB3U5XGeX5RWiSEYzdJmigv4qTII9VErtTkiqYshM00cJTYaOjE7FlcQH4QD4wl BKgn6BjI9oyv3MBWPmJO8U= Received: from localhost.localdomain (unknown [114.237.132.223]) by smtp20 (Coremail) with SMTP id H91pCgCns7_R_eZj_TmyDg--.62391S3; Sat, 11 Feb 2023 10:30:48 +0800 (CST) From: tumashu@163.com Date: Sat, 11 Feb 2023 10:30:39 +0800 Message-Id: <20230211023039.13181-2-tumashu@163.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211023039.13181-1-tumashu@163.com> References: <20230211023039.13181-1-tumashu@163.com> MIME-Version: 1.0 X-CM-TRANSID: H91pCgCns7_R_eZj_TmyDg--.62391S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JFy3uFWkZFyUXF18tw13urg_yoWkZrcEgr Z3GryktrWrJ3W7Ka95AF1IqF90g3y8JFsFgF43Krs2krn8ua1rXFn7uryDA3W3Ca1xK3WS kFs5Xr1fZry8ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sR_9a95UUUUU== X-Originating-IP: [114.237.132.223] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRRgT1GDuyng7egAAsn 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: Feng Shu * gnu/packages/wm.scm (mjwm): New variable. --- gnu/packages/wm.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0881ba40d5..1e9f6ad65f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2868,6 +2868,28 @@ (define-public jwm systems.") (license license:expat))) +(define-public mjwm + (package + (name "mjwm") + (version "4.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chiku/mjwm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lgfp2xidhvmbj4zqvzz9g8zwbn6mz0pgacc57b43ha523vamsjq")))) + (build-system gnu-build-system) + (home-page "https://github.com/chiku/mjwm") + (synopsis "Create menu for JWM.") + (description + "MJWM can create JWM's menu from (freedesktop) desktop files and the +generated file can be include in the rootmenu section of your jwm config +file.") + (license license:gpl2))) + (define-public devour (package (name "devour")