GNU bug report logs - #32811
[PATCH] enlightenment.scm: Fix initial locale and keyboard selection

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 32811 in the body.
You can then email your comments to 32811 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: Timo Eisenmann <eisenmann <at> fn.de>
To: guix-patches <at> gnu.org
Cc: Timo Eisenmann <eisenmann <at> fn.de>
Subject: [PATCH] enlightenment.scm: Fix initial locale and keyboard selection
Date: Sun, 23 Sep 2018 15:22:24 +0200

* gnu/packages/enlightenment.scm (enlightenment): Add glibc to inputs and fix path to xorg.lst
---
 gnu/packages/enlightenment.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 45dc1dbbe..2d3d0795f 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -275,6 +275,10 @@ Libraries with some extra bells and whistles.")
                  (("/usr/share/X11/xkb/rules/xorg.lst")
                   (string-append xkeyboard
                                  "/share/X11/xkb/rules/base.lst")))
+	       (substitute* "src/modules/wizard/page_011.c"
+                 (("/usr/share/X11/xkb/rules/xorg.lst")
+                  (string-append xkeyboard
+                                 "/share/X11/xkb/rules/base.lst")))
                (substitute* "src/modules/everything/evry_plug_apps.c"
                  (("/usr/bin/") ""))
                (substitute* "configure"
@@ -295,6 +299,7 @@ Libraries with some extra bells and whistles.")
        ("dbus" ,dbus)
        ("efl" ,efl)
        ("freetype" ,freetype)
+       ("glibc" ,glibc)
        ("libxcb" ,libxcb)
        ("libxext" ,libxext)
        ("linux-pam" ,linux-pam)
-- 
2.18.0

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

From: ludo <at> gnu.org (Ludovic Courtès)
To: Timo Eisenmann <eisenmann <at> fn.de>
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Mon, 24 Sep 2018 14:28:03 +0200

Hi Timo,

Timo Eisenmann <eisenmann <at> fn.de> skribis:

> * gnu/packages/enlightenment.scm (enlightenment): Add glibc to inputs and fix path to xorg.lst

Could you explain the effect of adding glibc as an input?  Normally this
is unnecessary because glibc is an implicit input.

Thank you for the patch!

Ludo’.

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

From: eisenmann <at> fn.de
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Mon, 24 Sep 2018 17:39:03 +0200

Hello Ludo,
> Could you explain the effect of adding glibc as an input?  Normally this
> is unnecessary because glibc is an implicit input.

glibc provides locale, which enlightenment uses to list languages.Without explicitly installing it, no languages are shown.
Regards,
Timo Eisenmann

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

From: ludo <at> gnu.org (Ludovic Courtès)
To: eisenmann <at> fn.de
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Mon, 24 Sep 2018 21:31:13 +0200

Hello Timo,

eisenmann <at> fn.de skribis:

>> Could you explain the effect of adding glibc as an input?  Normally this
>> is unnecessary because glibc is an implicit input.
>
> glibc provides locale, which enlightenment uses to list languages.Without explicitly installing it, no languages are shown.

OK, I see.  However, ‘locale’ is already present in the build
environment even without adding glibc explicitly.  Thus I wonder what’s
happening.

Do you happen to know what part of the Enlightenment code refers to the
‘locale’ command?

Thank you,
Ludo’.

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

From: Timo Eisenmann <eisenmann <at> fn.de>
To: ludo <at> gnu.org
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Tue, 25 Sep 2018 12:51:18 +0200

Hello Ludo,

>>> Could you explain the effect of adding glibc as an input?  Normally 
this
>>> is unnecessary because glibc is an implicit input.
>>
>> glibc provides locale, which enlightenment uses to list 
languages.Without explicitly installing it, no languages are shown.
>
> OK, I see.  However, ‘locale’ is already present in the build
> environment even without adding glibc explicitly. Thus I wonder what’s
> happening.

So implicit inputs provide their binaries only during build-time?
Enlightenment actually uses the output of 'locale -a' during runtime.

> Do you happen to know what part of the Enlightenment code refers to the
> ‘locale’ command?

Enlightenment uses
  output = popen("locale -a", "r");
in these three files:
  src/bin/e_intl.c (_e_intl_locale_system_locales_get)
  src/modules/conf_intl/e_int_config_intl.c (_fill_data)
  src/modules/wizard/page_010.c (wizard_page_init)

'page_010' is the language selection screen during first time config.

Regards,
Timo Eisenmann

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

From: ludo <at> gnu.org (Ludovic Courtès)
To: Timo Eisenmann <eisenmann <at> fn.de>
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Wed, 26 Sep 2018 09:36:55 +0200

Hi,

Timo Eisenmann <eisenmann <at> fn.de> skribis:

>> OK, I see.  However, ‘locale’ is already present in the build
>> environment even without adding glibc explicitly. Thus I wonder what’s
>> happening.
>
> So implicit inputs provide their binaries only during build-time?

Yes, inputs in general denote build-time dependencies.  Run-time
dependencies are automatically determined by scanning the build result
in search of /gnu/store references.

>> Do you happen to know what part of the Enlightenment code refers to the
>> ‘locale’ command?
>
> Enlightenment uses
>   output = popen("locale -a", "r");
> in these three files:
>   src/bin/e_intl.c (_e_intl_locale_system_locales_get)
>   src/modules/conf_intl/e_int_config_intl.c (_fill_data)
>   src/modules/wizard/page_010.c (wizard_page_init)
>
> 'page_010' is the language selection screen during first time config.

In that case a proper solution would be to replace ‘locale’ with
‘/gnu/store/…/bin/locale’ in the files above, using the ‘substitute*’
macro.  Would you like to give it a try?  There are many examples of
similar uses of ‘substitute*’ in the package definitions.

HTH!

Ludo’.

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

From: Timo Eisenmann <eisenmann <at> fn.de>
To: ludo <at> gnu.org
Cc: 32811 <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Wed, 26 Sep 2018 17:37:50 +0200

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

Hi Ludo,

>>> Do you happen to know what part of the Enlightenment code refers to 
>>> the ‘locale’ command? 
>> Enlightenment uses output = popen("locale -a", "r"); in these three 
>> files: src/bin/e_intl.c (_e_intl_locale_system_locales_get) 
>> src/modules/conf_intl/e_int_config_intl.c (_fill_data) 
>> src/modules/wizard/page_010.c (wizard_page_init) 'page_010' is the 
>> language selection screen during first time config. 
> In that case a proper solution would be to replace ‘locale’ with 
> ‘/gnu/store/…/bin/locale’ in the files above, using the ‘substitute*’ 
> macro. Would you like to give it a try? There are many examples of 
> similar uses of ‘substitute*’ in the package definitions.

I attached a patch that uses 'substitute*'.

Thanks for your help,
Timo Eisenmann

[0001-enlightenment.scm-Fix-initial-locale-and-keyboard-se.patch (text/plain, attachment)]

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

From: ludo <at> gnu.org (Ludovic Courtès)
To: Timo Eisenmann <eisenmann <at> fn.de>
Cc: 32811-done <at> debbugs.gnu.org
Subject: Re: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and
 keyboard selection
Date: Wed, 26 Sep 2018 23:41:43 +0200

Hi Timo,

Timo Eisenmann <eisenmann <at> fn.de> skribis:

> From 28035fa1ff242d1e4d45fccf0dfe58742702d6aa Mon Sep 17 00:00:00 2001
> From: Timo Eisenmann <eisenmann <at> fn.de>
> Date: Wed, 26 Sep 2018 17:01:33 +0200
> Subject: [PATCH] enlightenment.scm: Fix initial locale and keyboard selection
>
> * gnu/packages/enlightenment.scm (enlightenment): Fix paths to 'locale' and 'xorg.lst'

Awesome, pushed as e15ede6e28cfaf5fe951faf88d7c1e3213a476a4.  I added a
copyright line for you (let me know if I got it wrong!) and tweaked the
commit log to match our conventions.

Thank you!

Ludo’.

Previous Next

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