01/01: gnu: evolution-data-server: Fix locale handling.

[guix-commits]

samplet pushed a commit to branch core-updates
in repository guix.

commit d619686250d8bb15bf67031f8ac80f9cfb400a26
Author: Timothy Sample <address@hidden>
Date:   Sun Jul 14 23:47:44 2019 -0400

    gnu: evolution-data-server: Fix locale handling.
    
    * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Add a phase
    that patches the source code to fix a locale handling issue.
---
 gnu/packages/gnome.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ae5b85d..f42b506 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5211,6 +5211,22 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
                            "tests/libedata-cal/test-cal-cache-utils.c")
               (("/bin/rm") (which "rm")))
             #t))
+         ;; This phase fixes locale canonicalization when using newer
+         ;; versions of ICU.  The bug has been fixed upstream, and
+         ;; should appear starting in version 3.33.5.
+         ;; <https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137>.
+         (add-after 'unpack 'patch-locale-canonicalization
+           (lambda _
+             (substitute* "src/libedataserver/e-collator.c"
+               (("len = uloc_canonicalize \\(posix_locale,.*" x)
+                ((lambda (xs) (string-join xs "\n" 'suffix))
+                 (list
+                  "if (posix_locale && ("
+                  "    g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||"
+                  "    g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))"
+                  "  posix_locale = \"en_US_POSIX\";"
+                  x))))
+             #t))
          (add-before 'configure 'dont-override-rpath
            (lambda _
              (substitute* "CMakeLists.txt"