nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icu4c: Update to 54.1. 

* gnu/packages/icu4c.scm (icu4c): Update to 54.1.
* gnu/packages/patches/icu4c-test-date-format.patch: Remove unneeded patch.
* gnu-system.am (dist_patch_DATA): Unregister dropped patch.
This commit is contained in:
Andreas Enge 2014-11-20 14:01:20 +01:00
parent a4d8913613
commit 8c3fc83411
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -366,7 +366,6 @@ dist_patch_DATA = \
gnu/packages/patches/guix-test-networking.patch \ gnu/packages/patches/guix-test-networking.patch \
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/hop-bigloo-4.0b.patch \
gnu/packages/patches/icu4c-test-date-format.patch \
gnu/packages/patches/inkscape-stray-comma.patch \ gnu/packages/patches/inkscape-stray-comma.patch \
gnu/packages/patches/jbig2dec-ignore-testtest.patch \ gnu/packages/patches/jbig2dec-ignore-testtest.patch \
gnu/packages/patches/kmod-module-directory.patch \ gnu/packages/patches/kmod-module-directory.patch \

7
gnu/packages/icu4c.scm
View File

@ -28,7 +28,7 @@
(define-public icu4c (define-public icu4c
(package (package
(name "icu4c") (name "icu4c")
(version "53.1") (version "54.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.icu-project.org/files/icu4c/" (uri (string-append "http://download.icu-project.org/files/icu4c/"
@ -37,8 +37,7 @@
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz")) "-src.tgz"))
(sha256 (sha256
(base32 "0a4sg9w054640zncb13lhrcjqn7yg1qilwd1mczc4w60maslz9vg")) (base32 "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"))))
(patches (list (search-patch "icu4c-test-date-format.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("patchelf" ,patchelf) `(("patchelf" ,patchelf)
@ -59,7 +58,7 @@
'configure 'patch-configure 'configure 'patch-configure
(lambda _ (lambda _
;; patch out two occurrences of /bin/sh from configure script ;; patch out two occurrences of /bin/sh from configure script
;; that might have disappeared in a release later than 52.1 ;; that might have disappeared in a release later than 54.1
(substitute* "configure" (substitute* "configure"
(("`/bin/sh") (("`/bin/sh")
(string-append "`" (which "bash"))))) (string-append "`" (which "bash")))))

17
gnu/packages/patches/icu4c-test-date-format.patch
View File

@ -1,17 +0,0 @@
Starting with the switch to GCC 4.8.3, we observed this test failure.
Changing "34" to "134" means that we expect the date to be parsed as
"2034", not "1934", which seems consistent with the line above.
Reported at <http://bugs.icu-project.org/trac/ticket/10960>.
--- icu/source/test/intltest/dtfmttst.cpp 2014-06-16 10:35:46.000000000 +0200
+++ icu/source/test/intltest/dtfmttst.cpp 2014-06-16 10:35:52.000000000 +0200
@@ -1129,7 +1129,7 @@ DateFormatTest::TestTwoDigitYear()
return;
}
parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5));
- parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4));
+ parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4));
}
// -------------------------------------