diff mbox

gnu: windowmaker: Fix invocation of 'wmsetbg'.

Message ID 87mvhs725g.fsf@openmailbox.org
State New
Headers show

Commit Message

Kei Yamashita Oct. 25, 2016, 5:46 p.m. UTC
This patch allows Window Maker to run wmsetbg properly instead of
showing an error as it has been.
From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sun, 23 Oct 2016 13:50:05 -0400
Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.

* gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
40-character limit with a 107-character limit.
---
 gnu/packages/gnustep.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Marius Bakke Oct. 26, 2016, 3:07 a.m. UTC | #1
Kei Kebreau <kei@openmailbox.org> writes:

> This patch allows Window Maker to run wmsetbg properly instead of
> showing an error as it has been.
> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
> From: Kei Kebreau <kei@openmailbox.org>
> Date: Sun, 23 Oct 2016 13:50:05 -0400
> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
>
> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
> 40-character limit with a 107-character limit.
> ---
>  gnu/packages/gnustep.scm | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

I haven't tested this, but the diff looks reasonable. Good catch. Any
chance you can submit this upstream as well?
Kei Yamashita Oct. 26, 2016, 4:14 a.m. UTC | #2
Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> This patch allows Window Maker to run wmsetbg properly instead of
>> showing an error as it has been.
>> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <kei@openmailbox.org>
>> Date: Sun, 23 Oct 2016 13:50:05 -0400
>> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
>>
>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
>> 40-character limit with a 107-character limit.
>> ---
>>  gnu/packages/gnustep.scm | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> I haven't tested this, but the diff looks reasonable. Good catch. Any
> chance you can submit this upstream as well?

I could bring it up, but I'm not so sure that it would be a change worth
considering. The Window Maker mailing list is very low volume, and no
one seems to have complained about this.
Kei Yamashita Dec. 9, 2016, 9:09 p.m. UTC | #3
Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> This patch allows Window Maker to run wmsetbg properly instead of
>>> showing an error as it has been.
>>> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
>>> From: Kei Kebreau <kei@openmailbox.org>
>>> Date: Sun, 23 Oct 2016 13:50:05 -0400
>>> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
>>>
>>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
>>> 40-character limit with a 107-character limit.
>>> ---
>>>  gnu/packages/gnustep.scm | 8 +++++++-
>>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> I haven't tested this, but the diff looks reasonable. Good catch. Any
>> chance you can submit this upstream as well?
>
> I could bring it up, but I'm not so sure that it would be a change worth
> considering. The Window Maker mailing list is very low volume, and no
> one seems to have complained about this.

If it's okay with you, I'd like to push this change. I've heard nothing
from upstream yet.
Marius Bakke Dec. 9, 2016, 9:33 p.m. UTC | #4
Kei Kebreau <kei@openmailbox.org> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>
>>>> This patch allows Window Maker to run wmsetbg properly instead of
>>>> showing an error as it has been.
>>>> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
>>>> From: Kei Kebreau <kei@openmailbox.org>
>>>> Date: Sun, 23 Oct 2016 13:50:05 -0400
>>>> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
>>>>
>>>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
>>>> 40-character limit with a 107-character limit.
>>>> ---
>>>>  gnu/packages/gnustep.scm | 8 +++++++-
>>>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> I haven't tested this, but the diff looks reasonable. Good catch. Any
>>> chance you can submit this upstream as well?
>>
>> I could bring it up, but I'm not so sure that it would be a change worth
>> considering. The Window Maker mailing list is very low volume, and no
>> one seems to have complained about this.
>
> If it's okay with you, I'd like to push this change. I've heard nothing
> from upstream yet.

Yes of course. I thought it was already pushed, sorry for holding it up!
Leo Famulari Dec. 10, 2016, 1:02 a.m. UTC | #5
On Wed, Oct 26, 2016 at 12:14:03AM -0400, Kei Kebreau wrote:
> Marius Bakke <mbakke@fastmail.com> writes:
> 
> > Kei Kebreau <kei@openmailbox.org> writes:
> >
> >> This patch allows Window Maker to run wmsetbg properly instead of
> >> showing an error as it has been.
> >> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
> >> From: Kei Kebreau <kei@openmailbox.org>
> >> Date: Sun, 23 Oct 2016 13:50:05 -0400
> >> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
> >>
> >> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
> >> 40-character limit with a 107-character limit.
> >> ---
> >>  gnu/packages/gnustep.scm | 8 +++++++-
> >>  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > I haven't tested this, but the diff looks reasonable. Good catch. Any
> > chance you can submit this upstream as well?
> 
> I could bring it up, but I'm not so sure that it would be a change worth
> considering. The Window Maker mailing list is very low volume, and no
> one seems to have complained about this.

I think it's a safe change, but I also think we should always let
upstream know when we are modifying string-handling code in C.
Kei Yamashita Dec. 10, 2016, 3:12 a.m. UTC | #6
Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Marius Bakke <mbakke@fastmail.com> writes:
>>>
>>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>>
>>>>> This patch allows Window Maker to run wmsetbg properly instead of
>>>>> showing an error as it has been.
>>>>> From a113116da6f9f6574e9fde12e69a9d3acdc87769 Mon Sep 17 00:00:00 2001
>>>>> From: Kei Kebreau <kei@openmailbox.org>
>>>>> Date: Sun, 23 Oct 2016 13:50:05 -0400
>>>>> Subject: [PATCH] gnu: windowmaker: Fix invocation of 'wmsetbg'.
>>>>>
>>>>> * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add substitution of
>>>>> 40-character limit with a 107-character limit.
>>>>> ---
>>>>>  gnu/packages/gnustep.scm | 8 +++++++-
>>>>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>>>
>>>> I haven't tested this, but the diff looks reasonable. Good catch. Any
>>>> chance you can submit this upstream as well?
>>>
>>> I could bring it up, but I'm not so sure that it would be a change worth
>>> considering. The Window Maker mailing list is very low volume, and no
>>> one seems to have complained about this.
>>
>> If it's okay with you, I'd like to push this change. I've heard nothing
>> from upstream yet.
>
> Yes of course. I thought it was already pushed, sorry for holding it up!

No need to apologize! I misread the "as well" in your message as a
requirement before pushing. Pushed as fdb552bbd44e35d335ee1d430ffe5b0fc4bc237e.
diff mbox

Patch

diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index 6c365cb..8f72bb3 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -60,7 +60,13 @@ 
                         (string-append "\"" bin "/wmaker.inst")))
                      (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
                        (("\"wmsetbg")
-                        (string-append "\"" bin "/wmsetbg")))))
+                        (string-append "\"" bin "/wmsetbg")))
+                     ;; Add enough cells to the command character array to
+                     ;; allow passing our large path to the wmsetbg binary.
+                     ;; The path to wmsetbg in Guix requires 67 extra characters.
+                     (substitute* "src/defaults.c"
+                       (("len = strlen\\(text\\) \\+ 40;")
+                        (string-append "len = strlen(text) + 107;")))))
                  (alist-cons-after
                   'install 'wrap
                   (lambda* (#:key outputs #:allow-other-keys)