summaryrefslogtreecommitdiff
path: root/gnu/packages/gnome.scm
diff options
context:
space:
mode:
authorTimothy Sample <samplet@ngyro.com>2019-07-19 10:36:21 -0400
committerTimothy Sample <samplet@ngyro.com>2019-07-19 12:56:03 -0400
commite1f174ae284d9954840f1723ac012c0d3fbcecb4 (patch)
tree7cc4e75dfe3bc41ff4bbd4e7a38d466769193db6 /gnu/packages/gnome.scm
parentda9adfc7f7e11e6aeaa6322331e867bbafdab055 (diff)
gnu: evolution-data-server: Use a proper patch for locales.
See <https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00265.html>. * gnu/packages/patches/evolution-data-server-locales.patch: New file. * gnu/local.mk: Add it. * gnu/packages/gnome.scm (evolution-data-server): Replace the 'patch-locale-canonicalization' phase with the new patch.
Diffstat (limited to 'gnu/packages/gnome.scm')
-rw-r--r--gnu/packages/gnome.scm17
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index beaba3b4c5..9190301ee9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5162,6 +5162,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
+ (patches (search-patches "evolution-data-server-locales.patch"))
(sha256
(base32
"1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli"))))
@@ -5205,22 +5206,6 @@ 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"