GNU bug report logs - #29543
[PATCH] gnu: windowmaker: Add '.desktop' file.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29543 in the body.
You can then email your comments to 29543 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: windowmaker: Add '.desktop' file.
Date: Sat,  2 Dec 2017 19:46:53 -0500

* gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
phase.
---
 gnu/packages/gnustep.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 195249c43..9a2bfefb4 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -65,6 +65,7 @@ to easily create cross-compiled binaries.")
   (package
     (name "windowmaker")
     (version "0.95.8")
+    (synopsis "NeXTSTEP-like window manager")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -75,7 +76,7 @@ to easily create cross-compiled binaries.")
                 "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'pre-configure
            (lambda* (#:key outputs #:allow-other-keys)
@@ -97,14 +98,29 @@ to easily create cross-compiled binaries.")
                (substitute* "src/defaults.c"
                  (("len = strlen\\(text\\) \\+ 40;")
                   (string-append "len = strlen(text) + 107;"))))))
-         (add-after 'install 'wrap
+         (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 "/windowmaker.desktop")
+                 (lambda (port)
+                  (format port "~
+                    [Desktop Entry]~@
+                    Name=Window Maker~@
+                    Comment=~a~@
+                    Exec=~a/bin/wmaker~@
+                    Type=Application~%" ,synopsis %output))))
+             #t))
+         (add-after 'install-xsession 'wrap
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (bin (string-append out "/bin")))
                 ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
                 ;; etc., so make sure everything is in $PATH.
                 (wrap-program (string-append bin "/wmaker.inst")
-                              `("PATH" ":" prefix (,bin)))))))))
+                  `("PATH" ":" prefix (,bin)))))))))
     (inputs
      `(("libxmu" ,libxmu)
        ("libxft" ,libxft)
@@ -117,7 +133,6 @@ to easily create cross-compiled binaries.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://windowmaker.org/")
-    (synopsis "NeXTSTEP-like window manager")
     (description
      "Window Maker is an X11 window manager originally designed to provide
 integration support for the GNUstep Desktop Environment.  In every way
-- 
2.15.0

Message #8 received at 29543 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 29543 <at> debbugs.gnu.org
Subject: Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.
Date: Tue, 05 Dec 2017 13:39:23 +0100

Kei Kebreau <kkebreau <at> posteo.net> skribis:

> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
> phase.

[...]

> +               (call-with-output-file
> +                   (string-append xsessions "/windowmaker.desktop")
> +                 (lambda (port)
> +                  (format port "~
> +                    [Desktop Entry]~@
> +                    Name=Window Maker~@
> +                    Comment=~a~@
> +                    Exec=~a/bin/wmaker~@
> +                    Type=Application~%" ,synopsis %output))))

We’ll have to make sure that ‘synopsis’ does not contain any newline
character or the ‘.desktop’ file would have invalid syntax, I suppose.

To be on the safe side perhaps we can do:

  (string-map (match-lambda
                (#\newline #\space)
                (chr chr))
              synopsis)

Apart from that it LGTM, thanks!

Ludo’.

Message #11 received at 29543 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 29543 <at> debbugs.gnu.org
Subject: Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.
Date: Wed, 06 Dec 2017 14:46:40 -0500

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
>> phase.
>
> [...]
>
>> +               (call-with-output-file
>> +                   (string-append xsessions "/windowmaker.desktop")
>> +                 (lambda (port)
>> +                  (format port "~
>> +                    [Desktop Entry]~@
>> +                    Name=Window Maker~@
>> +                    Comment=~a~@
>> +                    Exec=~a/bin/wmaker~@
>> +                    Type=Application~%" ,synopsis %output))))
>
> We’ll have to make sure that ‘synopsis’ does not contain any newline
> character or the ‘.desktop’ file would have invalid syntax, I suppose.
>
> To be on the safe side perhaps we can do:
>
>   (string-map (match-lambda
>                 (#\newline #\space)
>                 (chr chr))
>               synopsis)
>
> Apart from that it LGTM, thanks!
>
> Ludo’.

Like I've attached?

[0001-gnu-windowmaker-Add-.desktop-file.patch (text/plain, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 29543 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 29543 <at> debbugs.gnu.org
Subject: Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.
Date: Wed, 06 Dec 2017 22:11:50 +0100

Kei Kebreau <kkebreau <at> posteo.net> skribis:

> Like I've attached?
>
> From df79e8050b4385d92d6807a4d76cb1c7347d5906 Mon Sep 17 00:00:00 2001
> From: Kei Kebreau <kkebreau <at> posteo.net>
> Date: Sat, 2 Dec 2017 19:43:08 -0500
> Subject: [PATCH] gnu: windowmaker: Add '.desktop' file.
>
> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
> phase. Add (guix build build-system), (guix build utils) and (ice-9 match) to

(Message cut too early?)

All right!

Ludo’.

Message #19 received at 29543-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 29543-done <at> debbugs.gnu.org
Subject: Re: [bug#29543] [PATCH] gnu: windowmaker: Add '.desktop' file.
Date: Wed, 06 Dec 2017 16:41:45 -0500

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> Like I've attached?
>>
>> From df79e8050b4385d92d6807a4d76cb1c7347d5906 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <kkebreau <at> posteo.net>
>> Date: Sat, 2 Dec 2017 19:43:08 -0500
>> Subject: [PATCH] gnu: windowmaker: Add '.desktop' file.
>>
>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession'
>> phase. Add (guix build build-system), (guix build utils) and (ice-9 match) to
>
> (Message cut too early?)
>

Yes, I meant to put #:modules, but I forgot that 'git commit' ignores lines
beginning with a hash symbol by default.

> All right!
>
> Ludo’.

Thanks for the review!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.