Bug#919481: Fix for RC #919481

2019-03-31 Thread Sébastien Villemot 
retitle 919481 guile-2.0: FTBFS when fr_FR.ISO-8859-1 locale is installed
user debian-rele...@lists.debian.org
usertags 919481 + bsp-2019-03-fr-paris
thank you

Dear Maintainer,

I am about to NMU guile-2.0 using Frédéric's patch. The debdiff is
attached.

Cheers,

-- 
⢀⣴⠾⠻⢶⣦⠀  Sébastien Villemot
⣾⠁⢠⠒⠀⣿⡁  Debian Developer
⢿⡄⠘⠷⠚⠋⠀  http://sebastien.villemot.name
⠈⠳⣄  http://www.debian.org
diff -Nru guile-2.0-2.0.13+1/debian/changelog guile-2.0-2.0.13+1/debian/changelog
--- guile-2.0-2.0.13+1/debian/changelog	2017-12-05 08:41:29.0 +0100
+++ guile-2.0-2.0.13+1/debian/changelog	2019-03-30 19:24:44.0 +0100
@@ -1,3 +1,12 @@
+guile-2.0 (2.0.13+1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * 0005-fix-french-locale-test.patch: new patch by Frédéric Bonnard.
+Fixes FTBFS when locale fr_FR.ISO-8859-1 is installed.
+(Closes: #919481)
+
+ -- Sébastien Villemot   Sat, 30 Mar 2019 19:24:44 +0100
+
 guile-2.0 (2.0.13+1-5) unstable; urgency=medium
 
   * Add upstream 0004-ia64-Fix-crash-in-thread-context-switch.patch to
diff -Nru guile-2.0-2.0.13+1/debian/patches/0005-fix-french-locale-test.patch guile-2.0-2.0.13+1/debian/patches/0005-fix-french-locale-test.patch
--- guile-2.0-2.0.13+1/debian/patches/0005-fix-french-locale-test.patch	1970-01-01 01:00:00.0 +0100
+++ guile-2.0-2.0.13+1/debian/patches/0005-fix-french-locale-test.patch	2019-03-30 19:24:22.0 +0100
@@ -0,0 +1,65 @@
+Description: Fix French locale test
+ In i18n tests, some test fail because of non-breaking spaces not being
+ matched. The tests convert values to strings in fr_FR.iso88591 which insert a
+ "locale-thousands-separator" which, in this locale, is a non-breaking space.
+ This string is compared to the hardcoded expected result which contains a
+ standard space (UTF8 hex. 20). As the file is UTF8, this patch replaces the bad
+ space with the UTF8 non-breaking space equivalent (hex. C2 A0).
+Author: Frédéric Bonnard 
+Bug-Debian: https://bugs.debian.org/919481
+Forwarded: no
+Reviewed-By: Sébastien Villemot 
+Last-Updated: 2019-03-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: guile-2.0-2.0.13+1/test-suite/tests/i18n.test
+===
+--- guile-2.0-2.0.13+1.orig/test-suite/tests/i18n.test	2016-10-22 22:09:34.0 +0200
 guile-2.0-2.0.13+1/test-suite/tests/i18n.test	2019-03-19 13:36:43.022766801 +0100
+@@ -514,19 +514,19 @@
+   (under-french-locale-or-unresolved
+(lambda ()
+  (let ((fr (make-locale LC_ALL %french-locale-name)))
+-   (string=? "123 456" (number->locale-string 123456 #t fr))
++   (string=? "123 456" (number->locale-string 123456 #t fr))
+ 
+ (pass-if "fraction"
+   (under-french-locale-or-unresolved
+(lambda ()
+  (let ((fr (make-locale LC_ALL %french-locale-name)))
+-   (string=? "1 234,567" (number->locale-string 1234.567 #t fr))
++   (string=? "1 234,567" (number->locale-string 1234.567 #t fr))
+ 
+ (pass-if "fraction, 1 digit"
+   (under-french-locale-or-unresolved
+(lambda ()
+  (let ((fr (make-locale LC_ALL %french-locale-name)))
+-   (string=? "1 234,5"
++   (string=? "1 234,5"
+  (number->locale-string 1234.567 1 fr
+ 
+ (with-test-prefix "format ~h"
+@@ -542,7 +542,7 @@
+(lambda ()
+  (if (null? (locale-digit-grouping %french-locale))
+  (throw 'unresolved)
+- (string=? "12 345,6789"
++ (string=? "12 345,6789"
+(format #f "~:h" 12345.6789 %french-locale)))
+ 
+   (with-test-prefix "English"
+@@ -564,12 +564,12 @@
+   (under-french-locale-or-unresolved
+(lambda ()
+  (let ((fr (make-locale LC_ALL %french-locale-name)))
+-   (string=? "123 456 +EUR"
++   (string=? "123 456 +EUR"
+  (monetary-amount->locale-string 123456 #f fr))
+ 
+ (pass-if "fraction"
+   (under-french-locale-or-unresolved
+(lambda ()
+  (let ((fr (make-locale LC_ALL %french-locale-name)))
+-   (string=? "1 234,56 EUR "
++   (string=? "1 234,56 EUR "
+  (monetary-amount->locale-string 1234.567 #t fr
diff -Nru guile-2.0-2.0.13+1/debian/patches/series guile-2.0-2.0.13+1/debian/patches/series
--- guile-2.0-2.0.13+1/debian/patches/series	2017-12-05 08:30:59.0 +0100
+++ guile-2.0-2.0.13+1/debian/patches/series	2019-03-30 19:21:50.0 +0100
@@ -2,3 +2,4 @@
 0002-Look-for-guile-procedures.txt-in-pkglibdir.patch
 0003-tests-Avoid-race-condition-in-REPL-server-test.patch
 0004-ia64-Fix-crash-in-thread-context-switch.patch
+0005-fix-french-locale-test.patch


signature.asc
Description: This is a digitally signed message part

Bug#919481: Fix for RC #919481

2019-03-19 Thread Frédéric Bonnard 
Package: src:guile-2.0
Version: 2.0.13+1-5
Control: tags -1 patch pending

--

I forgot to mention, the issue now appears because schroots seem to have
all locale created which was not the case before and the tests were
just skipped as UNRESOLVED (see the build log history). Now they run..
and fail, but the issue should be there since some time.

F.


pgpg_a6ZDMS4A.pgp
Description: PGP signature

Bug#919481: Fix for RC #919481

2019-03-19 Thread Frédéric Bonnard 
Hi,

this bug is actually not ppc64el specific, I could also reproduce it on
barriere.d.o (amd64).

That said, it seems to be an encoding issue.
In i18n tests, some test fail because of strings not being
lexicographically equal, specifically due to the nonbreaking space.
The tests convert values to strings which insert a
"locale-thousands-separator" which, in this case, is a non-breaking
space.
This string is compared to the hardcoded expected result which contains
a standard space (UTF8 hex. 20) As the file is UTF8, this patch replace
the bad space with the UTF8 non-breaking space equivalent hex. C2 A0 .
Thanks for reviewing the attached patch.

F.
Description: Fix unicode non-breaking spaces
 In i18n tests, some test fail because of non-breaking spaces not being matched.
The tests convert values to strings in fr_FR.iso88591 which insert a 
"locale-thousands-separator"
which, in this case, is a non-breaking space.
This string is compared to the hardcoded expected result which contains a 
standard space (UTF8 hex. 20)
As the file is UTF8, this patch replace the bad space with the UTF8 
non-breaking space equivalent
hex. C2 A0 .
Author: Frédéric Bonnard 
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: guile-2.0-2.0.13+1/test-suite/tests/i18n.test
===
--- guile-2.0-2.0.13+1.orig/test-suite/tests/i18n.test  2016-10-22 
22:09:34.0 +0200
+++ guile-2.0-2.0.13+1/test-suite/tests/i18n.test   2019-03-19 
13:36:43.022766801 +0100
@@ -514,19 +514,19 @@
   (under-french-locale-or-unresolved
(lambda ()
  (let ((fr (make-locale LC_ALL %french-locale-name)))
-   (string=? "123 456" (number->locale-string 123456 #t fr))
+   (string=? "123 456" (number->locale-string 123456 #t fr))
 
 (pass-if "fraction"
   (under-french-locale-or-unresolved
(lambda ()
  (let ((fr (make-locale LC_ALL %french-locale-name)))
-   (string=? "1 234,567" (number->locale-string 1234.567 #t fr))
+   (string=? "1 234,567" (number->locale-string 1234.567 #t fr))
 
 (pass-if "fraction, 1 digit"
   (under-french-locale-or-unresolved
(lambda ()
  (let ((fr (make-locale LC_ALL %french-locale-name)))
-   (string=? "1 234,5"
+   (string=? "1 234,5"
  (number->locale-string 1234.567 1 fr
 
 (with-test-prefix "format ~h"
@@ -542,7 +542,7 @@
(lambda ()
  (if (null? (locale-digit-grouping %french-locale))
  (throw 'unresolved)
- (string=? "12 345,6789"
+ (string=? "12 345,6789"
(format #f "~:h" 12345.6789 %french-locale)))
 
   (with-test-prefix "English"
@@ -564,12 +564,12 @@
   (under-french-locale-or-unresolved
(lambda ()
  (let ((fr (make-locale LC_ALL %french-locale-name)))
-   (string=? "123 456 +EUR"
+   (string=? "123 456 +EUR"
  (monetary-amount->locale-string 123456 #f fr))
 
 (pass-if "fraction"
   (under-french-locale-or-unresolved
(lambda ()
  (let ((fr (make-locale LC_ALL %french-locale-name)))
-   (string=? "1 234,56 EUR "
+   (string=? "1 234,56 EUR "
  (monetary-amount->locale-string 1234.567 #t fr


pgpBeZP_HpxR1.pgp
Description: PGP signature