GNU bug report logs -
#76153
[PATCH] gnu: icewm: iAdd icewm.desktop file.
Previous Next
Reported by: Andy Tai <atai <at> atai.org>
Date: Sun, 9 Feb 2025 07:17:02 UTC
Severity: normal
Tags: patch
Done: Andy Tai <lichengtai <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76153 in the body.
You can then email your comments to 76153 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sun, 09 Feb 2025 07:17:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Andy Tai <atai <at> atai.org>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Sun, 09 Feb 2025 07:17:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/wm.scm (icewm): Add 'install-xsession phase that
installs the icewm.desktop.file.
Change-Id: I94661ec15bccc3bcb1539a52c78cc303a4b5caf3
---
gnu/packages/wm.scm | 55 ++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8aa314e56b..7ce4bb9f34 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1027,19 +1027,19 @@ (define-public icewm
(package
(name "icewm")
(version "3.6.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ice-wm/icewm/releases/download/"
- version "/icewm-" version ".tar.lz"))
- (sha256
- (base32
- "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/ice-wm/icewm/releases/download/" version
+ "/icewm-" version ".tar.lz"))
+ (sha256
+ (base32 "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config))
(inputs (list fontconfig
fribidi
- glib ;for icewm-menu-fdo
+ glib ;for icewm-menu-fdo
imlib2
libice
libjpeg-turbo
@@ -1057,15 +1057,34 @@ (define-public icewm
lzip
perl))
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'skip-failing-test
- ;; strtest.cc tests failing due to $HOME and /etc setup
- ;; difference under guix
- (lambda _
- (substitute* "src/Makefile.in"
- (("TESTS = strtest\\$\\(EXEEXT\\)")
- "TESTS = ")))))))
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-failing-test
+ ;; strtest.cc tests failing due to $HOME and /etc setup
+ ;; difference under guix
+ (lambda _
+ (substitute* "src/Makefile.in"
+ (("TESTS = strtest\\$\\(EXEEXT\\)")
+ "TESTS = "))))
+ (add-after 'install 'install-xsession
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Add a .desktop file to xsessions.
+ (let* ((output (assoc-ref outputs "out"))
+ (xsessions (string-append output
+ "/share/xsessions")))
+ (mkdir-p xsessions)
+ (call-with-output-file (string-append xsessions
+
+ "/icewm.desktop")
+ (lambda (port)
+ (format port
+ "[Desktop Entry]~@
+ Name=icewm~@
+ Comment=IceWM window manager~@
+ Exec=~a/bin/icewm~@
+ TryExec=~@*~a/bin/icewm~@
+ Type=Application~%"
+ output)))))))))
(home-page "https://ice-wm.org/")
(synopsis "Window manager for the X Window System")
(description
base-commit: fd3876ec2a47909eac8e7fa0f24710a94ccb1459
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sun, 09 Feb 2025 07:21:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 76153 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/wm.scm (icewm): Add 'install-xsession phase that
installs the icewm.desktop.file.
Change-Id: I94661ec15bccc3bcb1539a52c78cc303a4b5caf3
---
gnu/packages/wm.scm | 55 ++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8aa314e56b..7ce4bb9f34 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1027,19 +1027,19 @@ (define-public icewm
(package
(name "icewm")
(version "3.6.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ice-wm/icewm/releases/download/"
- version "/icewm-" version ".tar.lz"))
- (sha256
- (base32
- "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/ice-wm/icewm/releases/download/" version
+ "/icewm-" version ".tar.lz"))
+ (sha256
+ (base32 "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config))
(inputs (list fontconfig
fribidi
- glib ;for icewm-menu-fdo
+ glib ;for icewm-menu-fdo
imlib2
libice
libjpeg-turbo
@@ -1057,15 +1057,34 @@ (define-public icewm
lzip
perl))
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'skip-failing-test
- ;; strtest.cc tests failing due to $HOME and /etc setup
- ;; difference under guix
- (lambda _
- (substitute* "src/Makefile.in"
- (("TESTS = strtest\\$\\(EXEEXT\\)")
- "TESTS = ")))))))
+ (list
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-failing-test
+ ;; strtest.cc tests failing due to $HOME and /etc setup
+ ;; difference under guix
+ (lambda _
+ (substitute* "src/Makefile.in"
+ (("TESTS = strtest\\$\\(EXEEXT\\)")
+ "TESTS = "))))
+ (add-after 'install 'install-xsession
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Add a .desktop file to xsessions.
+ (let* ((output (assoc-ref outputs "out"))
+ (xsessions (string-append output
+ "/share/xsessions")))
+ (mkdir-p xsessions)
+ (call-with-output-file (string-append xsessions
+
+ "/icewm.desktop")
+ (lambda (port)
+ (format port
+ "[Desktop Entry]~@
+ Name=icewm~@
+ Comment=IceWM window manager~@
+ Exec=~a/bin/icewm~@
+ TryExec=~@*~a/bin/icewm~@
+ Type=Application~%"
+ output)))))))))
(home-page "https://ice-wm.org/")
(synopsis "Window manager for the X Window System")
(description
base-commit: fd3876ec2a47909eac8e7fa0f24710a94ccb1459
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sun, 09 Feb 2025 07:25:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 76153 <at> debbugs.gnu.org (full text, mbox):
patch originally written here:
https://lists.nongnu.org/archive/html/help-guix/2022-05/msg00114.html
by
白い熊
ShiroiKuma
Information forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sat, 01 Mar 2025 21:34:03 GMT)
Full text and
rfc822 format available.
Message #14 received at 76153 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Andy Tai <atai <at> atai.org> writes:
> patch originally written here:
> https://lists.nongnu.org/archive/html/help-guix/2022-05/msg00114.html
>
> by
>
> 白い熊
> ShiroiKuma
I think it would be good to mention this in the commit message, I also
think it's missing why this change is being made, it's unclear to me at
least what this .desktop file enables?
Second thing, re-indenting parts of the package definition is fine, but
it's best to do that in a separate commit, that way the diff will be
clearer.
Thanks,
Chris
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sun, 02 Mar 2025 05:42:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 76153 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/wm.scm (icewm): Add 'install-xsession phase that
installs the icewm.desktop.file so icewm can be a choice as a desktop
in gdm (the graphical login screen)
Change-Id: I94661ec15bccc3bcb1539a52c78cc303a4b5caf3
---
gnu/packages/wm.scm | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ca79e39c57..126f71ddee 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1065,7 +1065,26 @@ (define-public icewm
(lambda _
(substitute* "src/Makefile.in"
(("TESTS = strtest\\$\\(EXEEXT\\)")
- "TESTS = ")))))))
+ "TESTS = "))))
+ (add-after 'install 'install-xsession
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Add a .desktop file to xsessions.
+ (let* ((output (assoc-ref outputs "out"))
+ (xsessions (string-append output
+ "/share/xsessions")))
+ (mkdir-p xsessions)
+ (call-with-output-file (string-append xsessions
+
+ "/icewm.desktop")
+ (lambda (port)
+ (format port
+ "[Desktop Entry]~@
+ Name=icewm~@
+ Comment=IceWM window manager~@
+ Exec=~a/bin/icewm~@
+ TryExec=~@*~a/bin/icewm~@
+ Type=Application~%"
+ output)))))))))
(home-page "https://ice-wm.org/")
(synopsis "Window manager for the X Window System")
(description
base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
--
2.43.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#76153; Package
guix-patches.
(Sun, 02 Mar 2025 06:35:01 GMT)
Full text and
rfc822 format available.
Message #20 received at 76153 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Andy Tai <atai <at> atai.org> writes:
> * gnu/packages/wm.scm (icewm): Add 'install-xsession phase that
> installs the icewm.desktop.file so icewm can be a choice as a desktop
> in gdm (the graphical login screen)
>
> Change-Id: I94661ec15bccc3bcb1539a52c78cc303a4b5caf3
> ---
> gnu/packages/wm.scm | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index ca79e39c57..126f71ddee 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -1065,7 +1065,26 @@ (define-public icewm
> (lambda _
> (substitute* "src/Makefile.in"
> (("TESTS = strtest\\$\\(EXEEXT\\)")
> - "TESTS = ")))))))
> + "TESTS = "))))
> + (add-after 'install 'install-xsession
> + (lambda* (#:key outputs #:allow-other-keys)
> + ;; Add a .desktop file to xsessions.
> + (let* ((output (assoc-ref outputs "out"))
use #$output
> + (xsessions (string-append output
> + "/share/xsessions")))
> + (mkdir-p xsessions)
> + (call-with-output-file (string-append xsessions
> +
> + "/icewm.desktop")
> + (lambda (port)
> + (format port
> + "[Desktop Entry]~@
> + Name=icewm~@
> + Comment=IceWM window manager~@
> + Exec=~a/bin/icewm~@
> + TryExec=~@*~a/bin/icewm~@
> + Type=Application~%"
> + output)))))))))
please use `make-desktop-entry-file'
> (home-page "https://ice-wm.org/")
> (synopsis "Window manager for the X Window System")
> (description
>
> base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
[signature.asc (application/pgp-signature, inline)]
bug closed, send any further explanations to
76153 <at> debbugs.gnu.org and Andy Tai <atai <at> atai.org>
Request was from
Andy Tai <lichengtai <at> gmail.com>
to
control <at> debbugs.gnu.org.
(Mon, 03 Mar 2025 05:38:02 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Mon, 31 Mar 2025 11:24:10 GMT)
Full text and
rfc822 format available.
This bug report was last modified 136 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.