From afca7b4ae1db7926698f7a5ff47ce0f03f42c663 Mon Sep 17 00:00:00 2001

From: Sirio Balmelli <sirio@b-ad.ch>
Date: Wed, 13 May 2020 20:02:48 +0200
Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD
To: debian-dpkg@lists.debian.org

Fixes build failures starting with:

i18n.c:27:8: error: unknown type name 'locale_t'

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
lib/dpkg/i18n.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/lib/dpkg/i18n.c b/lib/dpkg/i18n.c
index 495270003..d98392783 100644
--- a/lib/dpkg/i18n.c
+++ b/lib/dpkg/i18n.c
@@ -24,6 +24,9 @@
#include <dpkg/i18n.h>

#ifdef HAVE_USELOCALE
+#if __APPLE__
+#include <xlocale.h>
+#endif
static locale_t dpkg_C_locale;
#endif

--
2.26.2

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

From afca7b4ae1db7926698f7a5ff47ce0f03f42c663 Mon Sep 17 00:00:00 2001

From: Sirio Balmelli <sirio@b-ad.ch>
Date: Wed, 13 May 2020 20:02:48 +0200
Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD
To: debian-dpkg@lists.debian.org

Fixes build failures starting with:

i18n.c:27:8: error: unknown type name 'locale_t'

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
lib/dpkg/i18n.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/lib/dpkg/i18n.c b/lib/dpkg/i18n.c
index 495270003..d98392783 100644
--- a/lib/dpkg/i18n.c
+++ b/lib/dpkg/i18n.c
@@ -24,6 +24,9 @@
#include <dpkg/i18n.h>

#ifdef HAVE_USELOCALE
+#if __APPLE__
+#include <xlocale.h>
+#endif
static locale_t dpkg_C_locale;
#endif

--
2.26.2

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

V2h5IGRvZXMgbXkgdGVtcCBnYXVnZSBoYXZlIHRoaXMgbGFuZ3VhZ2UgbWVzc2FnZSBpbiBpdD/C oCA7KVRoYW5rcyBmb3IgdGhlIGhlbHAgZ3V5cy5ELS0gRG9uIEdvdWxkNSBDYXJnaWxsIFBsYWNl UmljaG1vbmRDaHJpc3RjaHVyY2gsIE5ldyBaZWFsYW5kTW9iaWxlL1RlbGVncmFtOiArIDY0IDIx IDExNCAwNjk5d3d3LmJvd2VudmFsZS5jby5uegotLS0tLS0tLSBPcmlnaW5hbCBtZXNzYWdlIC0t LS0tLS0tRnJvbTogU2lyaW8gQmFsbWVsbGkgPHNpcmlvQGItYWQuY2g+IERhdGU6IDE2LzA1LzIw ICA0OjEzIGFtICAoR01UKzEyOjAwKSBUbzogZGViaWFuLWRwa2dAbGlzdHMuZGViaWFuLm9yZyBT dWJqZWN0OiBbUEFUQ0hdIGkxOG4uYzogYWRkIGRlcGVuZGVuY3kgb24geGxvY2FsZS5oIGZvciBE YXJ3aW5CU0QgPkZyb20gYWZjYTdiNGFlMWRiNzkyNjY5OGY3YTVmZjQ3Y2UwZjAzZjQyYzY2MyBN b24gU2VwIDE3IDAwOjAwOjAwIDIwMDFGcm9tOiBTaXJpbyBCYWxtZWxsaSA8c2lyaW9AYi1hZC5j aD5EYXRlOiBXZWQsIDEzIE1heSAyMDIwIDIwOjAyOjQ4ICswMjAwU3ViamVjdDogW1BBVENIXSBp MThuLmM6IGFkZCBkZXBlbmRlbmN5IG9uIHhsb2NhbGUuaCBmb3IgRGFyd2luQlNEVG86IGRlYmlh bi1kcGtnQGxpc3RzLmRlYmlhbi5vcmdGaXhlcyBidWlsZCBmYWlsdXJlcyBzdGFydGluZyB3aXRo OsKgwqDCoCBpMThuLmM6Mjc6ODogZXJyb3I6IHVua25vd24gdHlwZSBuYW1lICdsb2NhbGVfdCdT aWduZWQtb2ZmLWJ5OiBTaXJpbyBCYWxtZWxsaSA8c2lyaW9AYi1hZC5jaD4tLS0gbGliL2Rwa2cv aTE4bi5jIHwgMyArKysgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKWRpZmYgLS1naXQg YS9saWIvZHBrZy9pMThuLmMgYi9saWIvZHBrZy9pMThuLmNpbmRleCA0OTUyNzAwMDMuLmQ5ODM5 Mjc4MyAxMDA2NDQtLS0gYS9saWIvZHBrZy9pMThuLmMrKysgYi9saWIvZHBrZy9pMThuLmNAQCAt MjQsNiArMjQsOSBAQCAjaW5jbHVkZSA8ZHBrZy9pMThuLmg+ICNpZmRlZiBIQVZFX1VTRUxPQ0FM RSsjaWYgX19BUFBMRV9fKyNpbmNsdWRlIDx4bG9jYWxlLmg+KyNlbmRpZiBzdGF0aWMgbG9jYWxl X3QgZHBrZ19DX2xvY2FsZTsgI2VuZGlmLS0yLjI2LjI=

PGh0bWw+PGhlYWQ+PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0 L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPjwvaGVhZD48Ym9keSBkaXI9ImF1dG8iPjxkaXYgZGlyPSJh dXRvIj5XaHkgZG9lcyBteSB0ZW1wIGdhdWdlIGhhdmUgdGhpcyBsYW5ndWFnZSBtZXNzYWdlIGlu IGl0PyZuYnNwOyA7KTwvZGl2PjxkaXYgZGlyPSJhdXRvIj48YnI+PC9kaXY+PGRpdiBkaXI9ImF1 dG8iPlRoYW5rcyBmb3IgdGhlIGhlbHAgZ3V5cy48L2Rpdj48ZGl2IGRpcj0iYXV0byI+PGJyPjwv ZGl2PjxkaXYgZGlyPSJhdXRvIj5EPC9kaXY+PGRpdiBkaXI9ImF1dG8iPjxicj48L2Rpdj48ZGl2 IGRpcj0iYXV0byI+PGJyPjwvZGl2PjxkaXYgZGlyPSJhdXRvIj48YnI+PC9kaXY+PGRpdiBpZD0i Y29tcG9zZXJfc2lnbmF0dXJlIiBkaXI9ImF1dG8iPjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQt VHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04Ij48cHJlIGNsYXNzPSJrOW1h aWwiIHN0eWxlPSJ3aGl0ZS1zcGFjZTogcHJlLXdyYXA7IHdvcmQtd3JhcDogYnJlYWstd29yZDsg Zm9udC1mYW1pbHk6IHNhbnMtc2VyaWY7IG1hcmdpbi10b3A6IDBweDsiPi0tIDxicj5Eb24gR291 bGQ8YnI+NSBDYXJnaWxsIFBsYWNlPGJyPlJpY2htb25kPGJyPkNocmlzdGNodXJjaCwgTmV3IFpl YWxhbmQ8YnI+TW9iaWxlL1RlbGVncmFtOiArIDY0IDIxIDExNCAwNjk5PGJyPjxhIGhyZWY9Imh0 dHA6Ly93d3cudHVza2VyLm5ldC5hdS8iPnd3dy48L2E+Ym93ZW52YWxlLmNvLm56PGJyPjxicj48 L3ByZT48L2Rpdj48ZGl2IGRpcj0iYXV0byI+PGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXYg c3R5bGU9ImZvbnQtc2l6ZToxMDAlO2NvbG9yOiMwMDAwMDAiIGRpcj0iYXV0byI+PCEtLSBvcmln aW5hbE1lc3NhZ2UgLS0+PGRpdj4tLS0tLS0tLSBPcmlnaW5hbCBtZXNzYWdlIC0tLS0tLS0tPC9k aXY+PGRpdj5Gcm9tOiBTaXJpbyBCYWxtZWxsaSAmbHQ7c2lyaW9AYi1hZC5jaCZndDsgPC9kaXY+ PGRpdj5EYXRlOiAxNi8wNS8yMCAgNDoxMyBhbSAgKEdNVCsxMjowMCkgPC9kaXY+PGRpdj5Ubzog ZGViaWFuLWRwa2dAbGlzdHMuZGViaWFuLm9yZyA8L2Rpdj48ZGl2PlN1YmplY3Q6IFtQQVRDSF0g aTE4bi5jOiBhZGQgZGVwZW5kZW5jeSBvbiB4bG9jYWxlLmggZm9yIERhcndpbkJTRCA8L2Rpdj48 ZGl2Pjxicj48L2Rpdj48L2Rpdj4mZ3Q7RnJvbSBhZmNhN2I0YWUxZGI3OTI2Njk4ZjdhNWZmNDdj ZTBmMDNmNDJjNjYzIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMTxicj5Gcm9tOiBTaXJpbyBCYWxt ZWxsaSAmbHQ7c2lyaW9AYi1hZC5jaCZndDs8YnI+RGF0ZTogV2VkLCAxMyBNYXkgMjAyMCAyMDow Mjo0OCArMDIwMDxicj5TdWJqZWN0OiBbUEFUQ0hdIGkxOG4uYzogYWRkIGRlcGVuZGVuY3kgb24g eGxvY2FsZS5oIGZvciBEYXJ3aW5CU0Q8YnI+VG86IGRlYmlhbi1kcGtnQGxpc3RzLmRlYmlhbi5v cmc8YnI+PGJyPkZpeGVzIGJ1aWxkIGZhaWx1cmVzIHN0YXJ0aW5nIHdpdGg6PGJyPjxicj4mbmJz cDsmbmJzcDsmbmJzcDsgaTE4bi5jOjI3Ojg6IGVycm9yOiB1bmtub3duIHR5cGUgbmFtZSAnbG9j YWxlX3QnPGJyPjxicj5TaWduZWQtb2ZmLWJ5OiBTaXJpbyBCYWxtZWxsaSAmbHQ7c2lyaW9AYi1h ZC5jaCZndDs8YnI+LS0tPGJyPiBsaWIvZHBrZy9pMThuLmMgfCAzICsrKzxicj4gMSBmaWxlIGNo YW5nZWQsIDMgaW5zZXJ0aW9ucygrKTxicj48YnI+ZGlmZiAtLWdpdCBhL2xpYi9kcGtnL2kxOG4u YyBiL2xpYi9kcGtnL2kxOG4uYzxicj5pbmRleCA0OTUyNzAwMDMuLmQ5ODM5Mjc4MyAxMDA2NDQ8 YnI+LS0tIGEvbGliL2Rwa2cvaTE4bi5jPGJyPisrKyBiL2xpYi9kcGtnL2kxOG4uYzxicj5AQCAt MjQsNiArMjQsOSBAQDxicj4gI2luY2x1ZGUgJmx0O2Rwa2cvaTE4bi5oJmd0Ozxicj48YnI+ICNp ZmRlZiBIQVZFX1VTRUxPQ0FMRTxicj4rI2lmIF9fQVBQTEVfXzxicj4rI2luY2x1ZGUgJmx0O3hs b2NhbGUuaCZndDs8YnI+KyNlbmRpZjxicj4gc3RhdGljIGxvY2FsZV90IGRwa2dfQ19sb2NhbGU7 PGJyPiAjZW5kaWY8YnI+PGJyPi0tPGJyPjIuMjYuMjxicj48YnI+PGJyPjxicj48YnI+PGJyPjwv Ym9keT48L2h0bWw+

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hello :)

I am the author of this patch; submitted it to the mailing list kernel-style to see what would happen.

In my workflow I use dpkg on Darwin (macOS), through the Nix package manager.

Building dpkg 1.20 borked with this message about internationalization, so I submitted this patch which fixes the issue on Darwin.

The corresponding git commit for this patch is here: https://github.com/siriobalmelli-foss/dpkg/commit/afca7b4ae1db7926698f7a5ff47ce0f03f42c663

FYI the patch has also been submitted for inclusion into nixpkgs so that downstream is ok while I work to get this fixed upstream: https://github.com/NixOS/nixpkgs/pull/87755


So ... am I presenting this right for inclusion into dpkg upstream?

Thank you, and any feedback is welcome :)

best,

Sirio

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Saturday, May 16, 2020 2:47 AM, Don Gould <don@bowenvale.co.nz> wrote:

Why does my temp gauge have this language message in it?  ;)

Thanks for the help guys.

D

--
Don Gould
5 Cargill Place
Richmond
Christchurch, New Zealand
Mobile/Telegram: + 64 21 114 0699
www.bowenvale.co.nz

-------- Original message --------
From: Sirio Balmelli <sirio@b-ad.ch>
Date: 16/05/20 4:13 am (GMT+12:00)
To: debian-dpkg@lists.debian.org
Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD

From afca7b4ae1db7926698f7a5ff47ce0f03f42c663 Mon Sep 17 00:00:00 2001

From: Sirio Balmelli <sirio@b-ad.ch>
Date: Wed, 13 May 2020 20:02:48 +0200
Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD
To: debian-dpkg@lists.debian.org

Fixes build failures starting with:

    i18n.c:27:8: error: unknown type name 'locale_t'

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
lib/dpkg/i18n.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/lib/dpkg/i18n.c b/lib/dpkg/i18n.c
index 495270003..d98392783 100644
--- a/lib/dpkg/i18n.c
+++ b/lib/dpkg/i18n.c
@@ -24,6 +24,9 @@
#include <dpkg/i18n.h>

#ifdef HAVE_USELOCALE
+#if __APPLE__
+#include <xlocale.h>
+#endif
static locale_t dpkg_C_locale;
#endif

--
2.26.2

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hi!

On Wed, 2020-05-13 at 18:11:00 +0000, Sirio Balmelli wrote:

Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD

Fixes build failures starting with:

i18n.c:27:8: error: unknown type name 'locale_t'

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>

Thanks for the report and patch! I've fixed this instead by checking
for the availability of the header:

<https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2261027>

Regards,
Guillem

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

That's brilliant, thank you :)

Makes sense to do it there rather than an #ifdef in the file.
I've updated the Nix derivation accordingly.

Fast response much appreciated,

Sirio

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Sunday, May 17, 2020 12:45 AM, Guillem Jover <guillem@debian.org> wrote:

Hi!

On Wed, 2020-05-13 at 18:11:00 +0000, Sirio Balmelli wrote:

Subject: [PATCH] i18n.c: add dependency on xlocale.h for DarwinBSD

Fixes build failures starting with:

i18n.c:27:8: error: unknown type name 'locale_t'

Signed-off-by: Sirio Balmelli sirio@b-ad.ch

Thanks for the report and patch! I've fixed this instead by checking
for the availability of the header:

https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2261027

Regards,
Guillem

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)