[bug#61056] [PATCH] gnu: Add jwm.

[bug#61056] [PATCH] gnu: Add jwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (jwm): New variable.
---
 gnu/packages/wm.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a860ed1f93..1fb2b46efc 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -108,6 +108,7 @@ (define-module (gnu packages wm)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
@@ -2793,6 +2794,67 @@ (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.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/joewing/jwm")
+             (commit "4640d3b48ea64bd57e3cea63e4c4a9cd558e6142")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xwk54y8q12y3cvbgrjhda6g4jd5f57bvyasyb9qdbczzxfhvxqw"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (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))))
+              #t)))))
+    (native-inputs
+     (list autoconf
+           automake
+           gettext-minimal
+           pkg-config))
+    (inputs
+     (list cairo
+           libjpeg-turbo
+           libpng
+           librsvg
+           libxext
+           libxinerama
+           libxmu
+           libxpm
+           libxrandr
+           libxt
+           pango))
+    (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.39.1

[bug#61056] [PATCH v2] gnu: Add jwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (jwm): New variable.
---
 gnu/packages/wm.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a860ed1f93..8aba0c615c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2793,6 +2793,62 @@ (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 '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))))
+              #t)))))
+    (native-inputs (list pkg-config))
+    (inputs
+     (list cairo
+           libjpeg-turbo
+           libpng
+           librsvg
+           libxext
+           libxinerama
+           libxmu
+           libxpm
+           libxrandr
+           libxt
+           pango))
+    (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.39.1

[bug#61056] jwm version

[Feng Shu]

from: https://github.com/joewing/jwm/issues/596

I know the newest version is 2.4.3 instead of 2.4.4

-- 

[bug#61056] [PATCH] gnu: Add mjwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (mjwm): New variable.
---
 gnu/packages/wm.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8aba0c615c..1dc923eee5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2849,6 +2849,27 @@ (define-public jwm
 systems.")
     (license license:expat)))
 
+(define-public mjwm
+  (package
+    (name "mjwm")
+    (version "4.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/chiku/mjwm/archive/refs/tags/"
+                    "v" version ".tar.gz"))
+              (sha256
+               (base32
+                "0q1n3jw22hjzas7q75nb0zkw1875kf4k518f8zg13h7si2knyxy3"))))
+    (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")
-- 
2.39.1

[bug#61056] [PATCH v3 1/2] gnu: Add jwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (jwm): New variable.
---
 gnu/packages/wm.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a860ed1f93..d4c82fb2a3 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2793,6 +2793,94 @@ (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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Separator/>\n        "
+                  "<Include>$HOME/.jwmrc-mjwm-guix</Include>\n")))))
+          (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))))
+              #t)))))
+    (native-inputs (list pkg-config))
+    (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.39.1

[bug#61056] [PATCH v4 1/2] gnu: Add jwm.

[Feng Shu]

* gnu/packages/wm.scm (jwm): New variable.
---
 gnu/packages/wm.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2fd70af07f..469bc00d75 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2764,6 +2764,95 @@ 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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize=Adwaita --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\n")))))
+          (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))))
+              #t)))))
+    (native-inputs (list pkg-config))
+    (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

-- 

[bug#61056] [PATCH v3 2/2] gnu: Add mjwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* 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 d4c82fb2a3..09d0e964ff 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2881,6 +2881,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")
-- 
2.39.1

[bug#61056] [PATCH v4 2/2] gnu: Add mjwm.

[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 469bc00d75..82c8a74a35 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2853,6 +2853,28 @@ such as the Raspberry Pi, though it is perfectly capable of running on modern
 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")
-- 
2.30.2


-- 

[bug#61056] [PATCH v5 1/2] gnu: Add jwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* 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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\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")
-- 
2.39.1

[bug#61056] [PATCH v5 2/2] gnu: Add mjwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* 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")
-- 
2.39.1

[bug#61056] [PATCH v6 1/2] gnu: Add jwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* 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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\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")
-- 
2.39.1

[bug#61056] [PATCH v6 2/2] gnu: Add mjwm.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (mjwm): New variable.
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 0881ba40d5..1925091ba2 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2868,6 +2868,39 @@ (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)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-subcategory.h
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "include/subcategory.h"
+                ;; icon name should be application-other instead of
+                ;; application-others.
+                (("applications-others") "applications-other")))))))
+    (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")
-- 
2.39.1

[bug#61056] [PATCH v7 1/2] gnu: Add jwm.

[Feng Shu]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: v7-0001-gnu-Add-jwm.patch --]
[-- Type: text/x-diff, Size: 5547 bytes --]

From 455305ffd5f4e0bca239c8fc0f65f0a1f36ba8d0 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sat, 11 Feb 2023 10:55:47 +0800
Subject: [PATCH v7 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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\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


[-- Attachment #2: Type: text/plain, Size: 5 bytes --]


-- 

[bug#61056] [PATCH v7 2/2] gnu: Add mjwm.

[Feng Shu]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: v7-0002-gnu-Add-mjwm.patch --]
[-- Type: text/x-diff, Size: 1880 bytes --]

From a21c037b851994b362b2cd8216d4e7aa82056e98 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sat, 11 Feb 2023 10:55:48 +0800
Subject: [PATCH v7 2/2] gnu: Add mjwm.

* gnu/packages/wm.scm (mjwm): New variable.
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 14dc3a0988..f719c53127 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3011,6 +3011,39 @@ such as the Raspberry Pi, though it is perfectly capable of running on modern
 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)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-subcategory.h
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "include/subcategory.h"
+                ;; icon name should be application-other instead of
+                ;; application-others.
+                (("applications-others") "applications-other")))))))
+    (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")
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 6 bytes --]



-- 

[bug#61056] [PATCH v8 1/2] gnu: Add jwm.

[Feng Shu]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: v8-0001-gnu-Add-jwm.patch --]
[-- Type: text/x-diff, Size: 5547 bytes --]

From 455305ffd5f4e0bca239c8fc0f65f0a1f36ba8d0 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\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


[-- Attachment #2: Type: text/plain, Size: 6 bytes --]



-- 

[bug#61056] [PATCH v8 2/2] gnu: Add mjwm.

[Feng Shu]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: v8-0002-gnu-Add-mjwm.patch --]
[-- Type: text/x-diff, Size: 1880 bytes --]

From a21c037b851994b362b2cd8216d4e7aa82056e98 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sat, 11 Feb 2023 10:55:48 +0800
Subject: [PATCH v8 2/2] gnu: Add mjwm.

* gnu/packages/wm.scm (mjwm): New variable.
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 14dc3a0988..f719c53127 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3011,6 +3011,39 @@ such as the Raspberry Pi, though it is perfectly capable of running on modern
 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)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-subcategory.h
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "include/subcategory.h"
+                ;; icon name should be application-other instead of
+                ;; application-others.
+                (("applications-others") "applications-other")))))))
+    (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")
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 6 bytes --]



-- 

[bug#61056] [PATCH v8 1/2] gnu: Add jwm.

[Feng Shu]

From 455305ffd5f4e0bca239c8fc0f65f0a1f36ba8d0 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
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.
+                (("<Menu ") "<!-- <Menu ")
+                (("</Menu>") "</Menu> -->")
+                ;; Adjust xterm path in terminal menu item.
+                ((">xterm</Program>")
+                 (string-append
+                  ">" (search-input-file inputs "/bin/xterm")
+                  "</Program>"))
+                ;; 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.
+                (("<RootMenu .*>" all)
+                 (string-append
+                  all "\n        "
+                  "<Program icon=\"jwm-red\" label=\"Update JWM Menu\">"
+                  (search-input-file inputs "/bin/mjwm")
+                  " --iconize --no-backup "
+                  " --output-file $HOME/.jwmrc-mjwm-guix"
+                  "</Program>\n        "
+                  "<Dynamic icon=\"folder\" label=\"Applications\">"
+                  "$HOME/.jwmrc-mjwm-guix"
+                  "</Dynamic>\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




-- 

[bug#61056] [PATCH v8 2/2] gnu: Add mjwm.

[Feng Shu]

From a21c037b851994b362b2cd8216d4e7aa82056e98 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sat, 11 Feb 2023 10:55:48 +0800
Subject: [PATCH v8 2/2] gnu: Add mjwm.

* gnu/packages/wm.scm (mjwm): New variable.
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 14dc3a0988..f719c53127 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3011,6 +3011,39 @@ such as the Raspberry Pi, though it is perfectly capable of running on modern
 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)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-subcategory.h
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "include/subcategory.h"
+                ;; icon name should be application-other instead of
+                ;; application-others.
+                (("applications-others") "applications-other")))))))
+    (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")
-- 
2.30.2



-- 

[bug#61056] Please review v8 version of jwm/mjwm patch.

[Feng Shu]

Hello:

Please review v8 version of jwm/mjwm patch.

Thanks

-- 

[bug#61056] [PATCH] gnu: Add jwm.

[Feng Shu]

ping :-)

[bug#61056] [PATCH] gnu: Add jwm.

[宋文武 via Guix-patches via]

Feng Shu <tumashu@163.com> writes:

> Hello:
>
> Please review v8 version of jwm/mjwm patch.
>
> Thanks

Hello, I have pushed jwm and mjwm with follow changes:

1. remove tango-icon-theme, mjwm, xterm from jwm's inputs.  see 2.

2. remove patch-example.jwmrc and install-tango-icon-files phases.
   I think those kind of customization better happend in ~/.jwmrc or
   a home service.
   
3. change libxrandr to libxrender for jwm, as the latter is actually
   used...

4. mjwm: remove '.' in synopsis, change license to 'license:gpl2+'.


What do you think of my changes in 1. and 2.?

[bug#61056] [PATCH 1/2] gnu: Add jwm.

[iyzsong--- via Guix-patches via]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (jwm): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/wm.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 5b8dbd5c70..c1cbd00cf5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2777,6 +2777,61 @@ (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 '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))
+    (inputs
+     (list cairo
+           libjpeg-turbo
+           libpng
+           librsvg
+           libxext
+           libxinerama
+           libxmu
+           libxpm
+           libxrender
+           libxt
+           pango))
+    (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.39.1

[bug#61056] [PATCH 2/2] gnu: Add mjwm.

[iyzsong--- via Guix-patches via]

From: Feng Shu <tumashu@163.com>

* gnu/packages/wm.scm (mjwm): New variable.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c1cbd00cf5..3f4c648901 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2832,6 +2832,39 @@ (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)
+    (arguments
+     (list
+      #:tests? #f   ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-subcategory.h
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "include/subcategory.h"
+                ;; icon name should be application-other instead of
+                ;; application-others.
+                (("applications-others") "applications-other")))))))
+    (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")
-- 
2.39.1

[bug#61056] [PATCH] gnu: Add jwm.

[宋文武 via Guix-patches via]

宋文武 <iyzsong@envs.net> writes:

> Feng Shu <tumashu@163.com> writes:
>
>> Hello:
>>
>> Please review v8 version of jwm/mjwm patch.
>>
>> Thanks
>
> Hello, I have pushed jwm and mjwm with follow changes:
Well, I haven't pushed due to other's updates, that's good.

>
> 1. remove tango-icon-theme, mjwm, xterm from jwm's inputs.  see 2.
>
> 2. remove patch-example.jwmrc and install-tango-icon-files phases.
>    I think those kind of customization better happend in ~/.jwmrc or
>    a home service.
>    
> 3. change libxrandr to libxrender for jwm, as the latter is actually
>    used...
>
> 4. mjwm: remove '.' in synopsis, change license to 'license:gpl2+'.
>
>
> What do you think of my changes in 1. and 2.?

My updated patches are replied to this issue.

[bug#61056] [PATCH] gnu: Add jwm.

[Feng Shu]

宋文武 <iyzsong@envs.net> writes:

> Feng Shu <tumashu@163.com> writes:
>
>> Hello:
>>
>> Please review v8 version of jwm/mjwm patch.
>>
>> Thanks
>
> Hello, I have pushed jwm and mjwm with follow changes:
>
> 1. remove tango-icon-theme, mjwm, xterm from jwm's inputs.  see 2.
>
> 2. remove patch-example.jwmrc and install-tango-icon-files phases.
>    I think those kind of customization better happend in ~/.jwmrc or
>    a home service.
>    
> 3. change libxrandr to libxrender for jwm, as the latter is actually
>    used...
>
> 4. mjwm: remove '.' in synopsis, change license to 'license:gpl2+'.
>
>
> What do you think of my changes in 1. and 2.?

no problem.

-- 

bug#61056: [PATCH] gnu: Add jwm.

[宋文武 via Guix-patches via]

Feng Shu <tumashu@163.com> writes:

> 宋文武 <iyzsong@envs.net> writes:
>
>> Feng Shu <tumashu@163.com> writes:
>>
>>> Hello:
>>>
>>> Please review v8 version of jwm/mjwm patch.
>>>
>>> Thanks
>>
>> Hello, I have pushed jwm and mjwm with follow changes:
>>
>> 1. remove tango-icon-theme, mjwm, xterm from jwm's inputs.  see 2.
>>
>> 2. remove patch-example.jwmrc and install-tango-icon-files phases.
>>    I think those kind of customization better happend in ~/.jwmrc or
>>    a home service.
>>    
>> 3. change libxrandr to libxrender for jwm, as the latter is actually
>>    used...
>>
>> 4. mjwm: remove '.' in synopsis, change license to 'license:gpl2+'.
>>
>>
>> What do you think of my changes in 1. and 2.?
>
> no problem.

Pushed, thank you!