[PATCH] gnu: icewm: iAdd icewm.desktop file.

  • Done
  • quality assurance status badge
Details
4 participants
  • Andy Tai
  • Andy Tai
  • Christopher Baines
  • Z572
Owner
unassigned
Submitted by
Andy Tai
Severity
normal

Debbugs page

Andy Tai wrote 1 months ago
(address . guix-patches@gnu.org)(name . Andy Tai)(address . atai@atai.org)
9a98aea8a4ba530cc59d35f16c989bb298c2c913.1739085365.git.atai@atai.org
* 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(-)

Toggle diff (81 lines)
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
Andy Tai wrote 1 months ago
[PATCH v2] gnu: icewm: Add icewm.desktop file.
(address . 76153@debbugs.gnu.org)(name . Andy Tai)(address . atai@atai.org)
97224d956e711613b54fbcffed781a5d503a63e2.1739085587.git.atai@atai.org
* 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(-)

Toggle diff (81 lines)
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
Christopher Baines wrote 2 weeks ago
Re: [bug#76153] [PATCH v2] gnu: icewm: Add icewm.desktop file.
(name . Andy Tai)(address . atai@atai.org)(address . 76153@debbugs.gnu.org)
877c58zbai.fsf@cbaines.net
Andy Tai <atai@atai.org> writes:

Toggle quote (8 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmfDfRVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfA7A/+KnWUGrgbcarAqo/PZ7AOOnbibPlHKb7p
ia5FWSdQMfAtjJ6UwMNN8//QYvGDOH2I/AvDR1SdeCQY6mL42GCBfI6PihslJqNp
o525kjgfMZU9b6U+TBDpkNPy4ppI3zrMSLV1mtFrQBoM51nuAJSuxlgMWtntcQTe
+VW9qX5a4zDvb9E2aSLjN2+7RGFWcBB7i7nNXHjTDEVugOd0OXCWMKG4rJx2GtW3
jZERbjnNMiiZVQWH6L7Q1fH+w3ulOqtN7gMd4ALOMX0CljNk6k51M5dNo57X/1Bq
eULGGY4SrsSSBw5GtjnfBMpa9KvRPi4F0u9rqUf+hTfXBSGAd3MqGMMPgm/vagxL
kTCMklxAKT00VSIVPxrmO06gUjqb0AJ93TRSzn8q3TwMH7Ek1kZFNXjMT1sLyYdT
ccFGKIw7iRlIXtZcBnlV32n+ye8iqLqvNY4ZyETH2t/CeC2uKYCm7KHS5bMS1osE
dDuSsc5InNcLg6UZHPGS7EcJUCXryl4812sAH8tFBnXUIDtKqfknkhDw1KZ6t1kj
XiZwwkO44J8vjZk5oej17whWbWCSP2u2lxT6xWk68yXNoi96QD4mUXvjYQQNus5W
IUYIXDp4vp1gNcnOxSNUHy9hC7LlCTikoZIXzJcUFQIY76CRws2x2dMa2kz4+pT9
ocK7IsJFVtk=
=FQpw
-----END PGP SIGNATURE-----

Andy Tai wrote 2 weeks ago
[PATCH v3] gnu: icewm: Add icewm.desktop file. patch originally written by 白い 熊 ShiroiKuma retrieved from https://lists.nongn u.org/archive/html/help-guix/2022-05/msg00114.html
(address . 76153@debbugs.gnu.org)(address . mail@cbaines.net)(name . Andy Tai)(address . atai@atai.org)
562a500312cab8951e0b015702c33d25d31a66f6.1740894035.git.atai@atai.org
* 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(-)

Toggle diff (36 lines)
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
Z572 wrote 2 weeks ago
Re: [bug#76153] [PATCH v3] gnu: icewm: Add icewm.desktop file. patch originally written by 白い熊 ShiroiKuma retrieved from https://lists.nongnu.org/archive/html/help-guix/2022-05/msg00114.html
(name . Andy Tai)(address . atai@atai.org)(address . 76153@debbugs.gnu.org)(address . mail@cbaines.net)
87cyf0lz4w.fsf@iscas.ac.cn
Andy Tai <atai@atai.org> writes:

Toggle quote (24 lines)
> * 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

Toggle quote (16 lines)
> + (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'

Toggle quote (5 lines)
> (home-page "https://ice-wm.org/")
> (synopsis "Window manager for the X Window System")
> (description
>
> base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmfD+98ACgkQO1qpk+Gi
3/CFjxAAvTRs/cZ4DDxiTMArXxIrYoC1rnFjw2jbb0ks5kmiedxJdSR5C4m/pOrb
/AffGWY1Pti1iO6UMv0rPbNc6ApdbJ5h1Y2PBHA2/5VU17jblZb3Y/zGvvNpUWvM
h9vc8uOKRyrZYqfxOZW8JySBKYE2ABQKRUF0tKy7wiATGHMwr8kt+WQncVA8qOVr
KsZbedQdfdsx1mIuVDKEamqB8rBIKg17Ar4j098gJ6LAhM0wg5CcucGNwbCyOxrM
wKEMxJnsdSPQnRYm/qHJKucalUHwiJqZ4wvWb2gUHxPqqUJbJHpyxkVydtBe6TxB
M2+G0hf+2Xs6D3dAdGKPcdGr8Agf0p6smDk8gWE1KC2kKsbPKhgO6fTfXoDKwE0A
LPu82c+/9t5OWqiFMJstS0FtI4hGB02BoV4To5QAdHKApN4YveDlJr2dzcz/hExp
NnGsekO9QlSNIgHr/ygmP0g9x0ALqCGJIoo8a5ntTdFOFLxnOREZOwWCznaZjnrk
q/uAUCvtIONuWz0D7j0ZO9kOynwfXJUtYx9saKqNzumlarKdJg4Kc8znHGyFnELu
QYr9HA5mW3Kox8g7pEtHlOu38fI41KuNLlOXFsKVAg0xOlAFXPwpntwKAUsSA/MB
8QY+12ZXByOX6qj2ii+DAV8umKhzXl/P/gP22VzUJM1/XcCQzPs=
=IY12
-----END PGP SIGNATURE-----

Andy Tai wrote 1 weeks ago
(name . GNU bug tracker automated control server)(address . control@debbugs.gnu.org)
CAJsg1E8uNkJ+a_f8SOKNqG07drAG--zviW0TVzyHLX5nLLY1yg@mail.gmail.com
close 76153
thanks
icewm itself comes with a .desktop file
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 76153@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 76153
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help