aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/icu/APKBUILD28
1 files changed, 16 insertions, 12 deletions
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index e9387579cb..7f5ac2de76 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,11 +1,12 @@
+# Contributor: Sergey Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=icu
-pkgver=58.1
+pkgver=58.2
# convert x.y.z to x_y_z
_ver=${pkgver//./_}
-pkgrel=1
+pkgrel=0
pkgdesc="International Components for Unicode library"
url="http://www.icu-project.org/"
arch="all"
@@ -15,7 +16,6 @@ depends=
makedepends=
source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz
icu-timezone.patch
- musl-fixes.patch
"
# secfixes:
@@ -30,6 +30,13 @@ prepare() {
cd "$builddir"
update_config_sub || return 1
+ # strtod_l() is not supported by musl; also xlocale.h is missing
+ # It is not possible to disable its use via configure switches or env vars
+ # so monkey patching is needed. Idea was stollen from openembedded
+ # https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/icu/icu.inc#L30
+ sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure.ac
+ sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure
+
local x
# https://bugs.icu-project.org/trac/ticket/6102
for x in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
@@ -74,12 +81,9 @@ libs() {
replaces="icu"
}
-md5sums="1901302aaff1c1633ef81862663d2917 icu4c-58_1-src.tgz
-2c81d9c9a6ea0af5b7391e001f37a5e0 icu-timezone.patch
-391f6976653b48459edd7a089745259f musl-fixes.patch"
-sha256sums="0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 icu4c-58_1-src.tgz
-1c3c432228ee254af7adc995d65b65a4c9dac3b868fe1e49fe588a0ffa55a158 icu-timezone.patch
-bec3afc90cdec0325b2c1c8c02864c6ed0a484f520f2e7230f2b9c38e8a61dfd musl-fixes.patch"
-sha512sums="59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 icu4c-58_1-src.tgz
-40489c36e28e160f08e045acab6c19cdb712ad3b7f87f67099deac7d579aaf13d8841cd3278a6bb0e998b5c34a378348a13fcc8bb14c9c4eb4f6adbd10d66825 icu-timezone.patch
-2fe06ab01a123c36942db1f1dc8b42e79bcd033ac09b0bc964e3b1b7f309bb44570585dc8b50f28f9fb0a6d9540b12dd9e147660eec9b50b80b7257d6a840d82 musl-fixes.patch"
+md5sums="fac212b32b7ec7ab007a12dff1f3aea1 icu4c-58_2-src.tgz
+2c81d9c9a6ea0af5b7391e001f37a5e0 icu-timezone.patch"
+sha256sums="2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c icu4c-58_2-src.tgz
+1c3c432228ee254af7adc995d65b65a4c9dac3b868fe1e49fe588a0ffa55a158 icu-timezone.patch"
+sha512sums="5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a icu4c-58_2-src.tgz
+40489c36e28e160f08e045acab6c19cdb712ad3b7f87f67099deac7d579aaf13d8841cd3278a6bb0e998b5c34a378348a13fcc8bb14c9c4eb4f6adbd10d66825 icu-timezone.patch"