summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD20
-rw-r--r--icu-testtwodigityear.patch13
3 files changed, 13 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2b05f781f427..3c60ddf5a1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = icu50
pkgdesc = International Components for Unicode library
- pkgver = 50.1.2
- pkgrel = 3
+ pkgver = 50.2.0
+ pkgrel = 1
url = http://site.icu-project.org/
arch = i686
arch = x86_64
@@ -11,13 +11,11 @@ pkgbase = icu50
makedepends = patch
depends = gcc-libs>=4.7.1-5
depends = sh
- source = http://download.icu-project.org/files/icu4c/50.1.2/icu4c-50_1_2-src.tgz
+ source = icu-50.2.0.tar.gz::https://github.com/unicode-org/icu/archive/release-50-2.tar.gz
source = icu.8198.revert.icu5431.patch
- source = icu-testtwodigityear.patch
source = icu-positionNULLcheck.patch
- md5sums = beb98aa972219c9fcd9c8a71314943c9
+ md5sums = 671a083d9e56e953e36f10c556531637
md5sums = ebd5470fc969c75e52baf4af94a9ee82
- md5sums = 8d14652aee347adba25886cd14af1637
md5sums = c2ead5292460c386818d75b2b6a69a5f
pkgname = icu50
diff --git a/PKGBUILD b/PKGBUILD
index 2b92e14c9f95..d47ce176e32f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
_pkgbase=icu
_pkgmajor=50
-_pkgminor=1
-_pkgpatch=2
+_pkgminor=2
+_pkgpatch=0
_libdir='/usr/lib'
pkgname=${_pkgbase}${_pkgmajor}
pkgver=${_pkgmajor}.${_pkgminor}.${_pkgpatch}
-pkgrel=3
+pkgrel=1
pkgdesc='International Components for Unicode library'
url='http://site.icu-project.org/'
license=('custom:icu')
@@ -18,17 +18,15 @@ license=('custom:icu')
arch=('i686' 'x86_64')
depends=('gcc-libs>=4.7.1-5' 'sh')
makedepends=('clang' 'make' 'patch')
-source=("http://download.icu-project.org/files/${_pkgbase}4c/${pkgver}/${_pkgbase}4c-${pkgver//./_}-src.tgz"
+source=(${_pkgbase}-${pkgver}.tar.gz::https://github.com/unicode-org/icu/archive/release-50-2.tar.gz
'icu.8198.revert.icu5431.patch'
- 'icu-testtwodigityear.patch'
'icu-positionNULLcheck.patch')
-md5sums=('beb98aa972219c9fcd9c8a71314943c9'
+md5sums=('671a083d9e56e953e36f10c556531637'
'ebd5470fc969c75e52baf4af94a9ee82'
- '8d14652aee347adba25886cd14af1637'
'c2ead5292460c386818d75b2b6a69a5f')
prepare() {
- cd ${srcdir}/${_pkgbase}/source
+ cd ${srcdir}/${_pkgbase}-release-${_pkgmajor}-${_pkgminor}/icu4c/source
# fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
@@ -43,7 +41,7 @@ prepare() {
}
build() {
- cd ${srcdir}/${_pkgbase}/source
+ cd ${srcdir}/${_pkgbase}-release-${_pkgmajor}-${_pkgminor}/icu4c/source
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -52,12 +50,12 @@ build() {
}
check() {
- cd ${srcdir}/${_pkgbase}/source
+ cd ${srcdir}/${_pkgbase}-release-${_pkgmajor}-${_pkgminor}/icu4c/source
make check
}
package() {
- cd ${srcdir}/${_pkgbase}/source
+ cd ${srcdir}/${_pkgbase}-release-${_pkgmajor}-${_pkgminor}/icu4c/source
# copy only version specific libs
mkdir -p ${pkgdir}${_libdir}
diff --git a/icu-testtwodigityear.patch b/icu-testtwodigityear.patch
deleted file mode 100644
index 6d2209775d0f..000000000000
--- a/icu-testtwodigityear.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-In the year 2034 ...
-http://sourceforge.net/p/icu/mailman/message/32443311/
---- icu.orig/source/test/intltest/dtfmttst.cpp 2013-10-04 22:48:00.000000000 +0200
-+++ icu/source/test/intltest/dtfmttst.cpp 2014-06-13 19:34:40.611299572 +0200
-@@ -1129,7 +1129,7 @@
- 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));
- }
-
- // -------------------------------------