From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Bw1-0006kA-Qa for guix-patches@gnu.org; Wed, 26 Sep 2018 11:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5Bvy-0008Os-K4 for guix-patches@gnu.org; Wed, 26 Sep 2018 11:41:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5Bvy-0008Ol-G1 for guix-patches@gnu.org; Wed, 26 Sep 2018 11:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g5Bvy-0006Cr-Cf for guix-patches@gnu.org; Wed, 26 Sep 2018 11:41:02 -0400 Subject: [bug#32811] [PATCH] enlightenment.scm: Fix initial locale and keyboard selection Resent-Message-ID: From: Timo Eisenmann References: <87c1e7471d626c89b2aae314eb4a1915@email.freenet.de> <877ejau1z2.fsf@gnu.org> <909e244a-1fb7-361b-63b1-9e70bc042e53@fn.de> <87a7o44smg.fsf@gnu.org> Message-ID: Date: Wed, 26 Sep 2018 17:37:50 +0200 MIME-Version: 1.0 In-Reply-To: <87a7o44smg.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------AA0F59AC647BCFBFE97C1333" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ludo@gnu.org Cc: 32811@debbugs.gnu.org This is a multi-part message in MIME format. --------------AA0F59AC647BCFBFE97C1333 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit 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 --------------AA0F59AC647BCFBFE97C1333 Content-Type: text/plain; charset=UTF-8; name="0001-enlightenment.scm-Fix-initial-locale-and-keyboard-se.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-enlightenment.scm-Fix-initial-locale-and-keyboard-se.pa"; filename*1="tch" RnJvbSAyODAzNWZhMWZmMjQyZDFlNGQ0NWZjY2YwZGZlNTg3NDI3MDJkNmFhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vIEVpc2VubWFubiA8ZWlzZW5tYW5uQGZuLmRl PgpEYXRlOiBXZWQsIDI2IFNlcCAyMDE4IDE3OjAxOjMzICswMjAwClN1YmplY3Q6IFtQQVRD SF0gZW5saWdodGVubWVudC5zY206IEZpeCBpbml0aWFsIGxvY2FsZSBhbmQga2V5Ym9hcmQg c2VsZWN0aW9uCgoqIGdudS9wYWNrYWdlcy9lbmxpZ2h0ZW5tZW50LnNjbSAoZW5saWdodGVu bWVudCk6IEZpeCBwYXRocyB0byAnbG9jYWxlJyBhbmQgJ3hvcmcubHN0JwotLS0KIGdudS9w YWNrYWdlcy9lbmxpZ2h0ZW5tZW50LnNjbSB8IDEwICsrKysrKysrLS0KIDEgZmlsZSBjaGFu Z2VkLCA4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL2VubGlnaHRlbm1lbnQuc2NtIGIvZ251L3BhY2thZ2VzL2VubGlnaHRlbm1l bnQuc2NtCmluZGV4IDQ1ZGMxZGJiZS4uMGNlZDcwMjg4IDEwMDY0NAotLS0gYS9nbnUvcGFj a2FnZXMvZW5saWdodGVubWVudC5zY20KKysrIGIvZ251L3BhY2thZ2VzL2VubGlnaHRlbm1l bnQuc2NtCkBAIC0yNjgsMTMgKzI2OCwxOSBAQCBMaWJyYXJpZXMgd2l0aCBzb21lIGV4dHJh IGJlbGxzIGFuZCB3aGlzdGxlcy4iKQogICAgICAgICAgKGFkZC1iZWZvcmUgJ2NvbmZpZ3Vy ZSAnc2V0LXN5c3RlbS1hY3Rpb25zCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1 dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICAgICAgICAgICAgIChsZXQgKCh4a2V5Ym9hcmQg KGFzc29jLXJlZiBpbnB1dHMgInhrZXlib2FyZC1jb25maWciKSkKLSAgICAgICAgICAgICAg ICAgICAodXRpbHMgICAgIChhc3NvYy1yZWYgaW5wdXRzICJ1dGlsLWxpbnV4IikpKQorICAg ICAgICAgICAgICAgICAgICh1dGlscyAgICAgKGFzc29jLXJlZiBpbnB1dHMgInV0aWwtbGlu dXgiKSkKKyAgICAgICAgICAgICAgICAgICAobGliYyAgICAgIChhc3NvYy1yZWYgaW5wdXRz ICJsaWJjIikpKQogICAgICAgICAgICAgICAgOzsgV2UgbmVlZCB0byBwYXRjaCB0aGUgcGF0 aCB0byAnYmFzZS5sc3QnIHRvIGJlIGFibGUKICAgICAgICAgICAgICAgIDs7IHRvIHN3aXRj aCB0aGUga2V5Ym9hcmQgbGF5b3V0IGluIEUuCi0gICAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogInNyYy9tb2R1bGVzL3hrYnN3aXRjaC9lX21vZF9wYXJzZS5jIgorICAgICAgICAgICAg ICAgKHN1YnN0aXR1dGUqIChsaXN0ICJzcmMvbW9kdWxlcy94a2Jzd2l0Y2gvZV9tb2RfcGFy c2UuYyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic3JjL21vZHVsZXMv d2l6YXJkL3BhZ2VfMDExLmMiKQogICAgICAgICAgICAgICAgICAoKCIvdXNyL3NoYXJlL1gx MS94a2IvcnVsZXMveG9yZy5sc3QiKQogICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBl bmQgeGtleWJvYXJkCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NoYXJl L1gxMS94a2IvcnVsZXMvYmFzZS5sc3QiKSkpCisgICAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogKGxpc3QgInNyYy9iaW4vZV9pbnRsLmMiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgInNyYy9tb2R1bGVzL2NvbmZfaW50bC9lX2ludF9jb25maWdfaW50bC5jIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzcmMvbW9kdWxlcy93aXphcmQv cGFnZV8wMTAuYyIpCisgICAgICAgICAgICAgICAgICgoImxvY2FsZSAtYSIpIChzdHJpbmct YXBwZW5kIGxpYmMgIi9iaW4vbG9jYWxlIC1hIikpKQogICAgICAgICAgICAgICAgKHN1YnN0 aXR1dGUqICJzcmMvbW9kdWxlcy9ldmVyeXRoaW5nL2V2cnlfcGx1Z19hcHBzLmMiCiAgICAg ICAgICAgICAgICAgICgoIi91c3IvYmluLyIpICIiKSkKICAgICAgICAgICAgICAgIChzdWJz dGl0dXRlKiAiY29uZmlndXJlIgotLSAKMi4xOC4wCgo= --------------AA0F59AC647BCFBFE97C1333--