diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 13:03:33 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 16:38:44 +0000 |
| commit | 2fd7d71ae530e6bd64a44b74a470a03ea81f78d0 (patch) | |
| tree | f98fe2f424daf3399baebc6de2925db2c33023dd /main/icu | |
| parent | ef56c18fb98f9e31de7856e52aa2b73bc05d7b2a (diff) | |
| download | aports-2fd7d71ae530e6bd64a44b74a470a03ea81f78d0.tar.bz2 aports-2fd7d71ae530e6bd64a44b74a470a03ea81f78d0.tar.xz | |
main/icu: upgrade to 54.1
Diffstat (limited to 'main/icu')
| -rw-r--r-- | main/icu/APKBUILD | 14 | ||||
| -rw-r--r-- | main/icu/icu-timezone.patch | 23 |
2 files changed, 16 insertions, 21 deletions
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD index 0a29a452d9..35cd5d3b94 100644 --- a/main/icu/APKBUILD +++ b/main/icu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=icu -pkgver=53.1 +pkgver=54.1 # convert x.y.z to x_y_z _ver=${pkgver//./_} @@ -67,9 +67,9 @@ libs() { replaces="icu" } -md5sums="b73baa6fbdfef197608d1f69300919b9 icu4c-53_1-src.tgz -7c5d8b8105c26afa78fa4300bb4bed48 icu-timezone.patch" -sha256sums="6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28 icu4c-53_1-src.tgz -b5bff5392e5c6b8bacd8f06fd32bff08688c7884bd33ffc10ef4338f621c6ef5 icu-timezone.patch" -sha512sums="2172bfa7d61172b62380762f180336cf86264faed247e57f9143a5dcc84c286b96baa100302c0d54fe6f51af2d7e286cc5176db8f99c58157a5a750270e770df icu4c-53_1-src.tgz -fc424cf0b78c9dcdea309e161b4ead3537207dc1b0ef8a2b0d824360a261f7b358cc0261e8c9e74f61244b67db106c92902ff63fcbaabf31d701d38e37a8e658 icu-timezone.patch" +md5sums="e844caed8f2ca24c088505b0d6271bc0 icu4c-54_1-src.tgz +2c81d9c9a6ea0af5b7391e001f37a5e0 icu-timezone.patch" +sha256sums="d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 icu4c-54_1-src.tgz +1c3c432228ee254af7adc995d65b65a4c9dac3b868fe1e49fe588a0ffa55a158 icu-timezone.patch" +sha512sums="d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c icu4c-54_1-src.tgz +40489c36e28e160f08e045acab6c19cdb712ad3b7f87f67099deac7d579aaf13d8841cd3278a6bb0e998b5c34a378348a13fcc8bb14c9c4eb4f6adbd10d66825 icu-timezone.patch" diff --git a/main/icu/icu-timezone.patch b/main/icu/icu-timezone.patch index 19ee8ca0fe..c1d05c2548 100644 --- a/main/icu/icu-timezone.patch +++ b/main/icu/icu-timezone.patch @@ -1,16 +1,11 @@ ---- source/common/putilimp.h -+++ source/common/putilimp.h -@@ -115,11 +115,8 @@ - /* Use the predefined value. */ - #elif U_PLATFORM == U_PF_ANDROID - # define U_TIMEZONE timezone --#elif U_PLATFORM_IS_LINUX_BASED --# if !defined(__UCLIBC__) -- /* __timezone is only available in glibc */ --# define U_TIMEZONE __timezone --# endif -+#elif U_PLATFORM_IS_LINUX_BASED && defined(__GLIBC__) && !defined(__UCLIBC__) -+# define U_TIMEZONE __timezone +--- ./common/putilimp.h.orig ++++ ./common/putilimp.h +@@ -123,6 +123,8 @@ + # elif defined(__GLIBC__) + /* glibc */ + # define U_TIMEZONE __timezone ++# else ++# define U_TIMEZONE timezone + # endif #elif U_PLATFORM_USES_ONLY_WIN32_API # define U_TIMEZONE _timezone - #elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) |