icu: updated to 67.1

diff --git a/icu/.footprint b/icu/.footprint
index 1a9bb0849e0de7b49eecdec96943bf2c1b00f4d6..01420ce3d847d72abccec7f910e62b5d0530ab7a 100644 (file)
--- a/icu/.footprint
+++ b/icu/.footprint
@@ -202,30 +202,30 @@ drwxr-xr-x        root/root       usr/include/unicode/
 -rw-r--r--     root/root       usr/include/unicode/vtzone.h
 drwxr-xr-x     root/root       usr/lib/
 drwxr-xr-x     root/root       usr/lib/icu/
-drwxr-xr-x     root/root       usr/lib/icu/65.1/
--rw-r--r--     root/root       usr/lib/icu/65.1/Makefile.inc
--rw-r--r--     root/root       usr/lib/icu/65.1/pkgdata.inc
+drwxr-xr-x     root/root       usr/lib/icu/67.1/
+-rw-r--r--     root/root       usr/lib/icu/67.1/Makefile.inc
+-rw-r--r--     root/root       usr/lib/icu/67.1/pkgdata.inc
 lrwxrwxrwx     root/root       usr/lib/icu/Makefile.inc -> current/Makefile.inc
-lrwxrwxrwx     root/root       usr/lib/icu/current -> 65.1
+lrwxrwxrwx     root/root       usr/lib/icu/current -> 67.1
 lrwxrwxrwx     root/root       usr/lib/icu/pkgdata.inc -> current/pkgdata.inc
-lrwxrwxrwx     root/root       usr/lib/libicudata.so -> libicudata.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicudata.so.65 -> libicudata.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicudata.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicui18n.so -> libicui18n.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicui18n.so.65 -> libicui18n.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicui18n.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicuio.so -> libicuio.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicuio.so.65 -> libicuio.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicuio.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicutest.so -> libicutest.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicutest.so.65 -> libicutest.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicutest.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicutu.so -> libicutu.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicutu.so.65 -> libicutu.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicutu.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicuuc.so -> libicuuc.so.65.1
-lrwxrwxrwx     root/root       usr/lib/libicuuc.so.65 -> libicuuc.so.65.1
--rwxr-xr-x     root/root       usr/lib/libicuuc.so.65.1
+lrwxrwxrwx     root/root       usr/lib/libicudata.so -> libicudata.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicudata.so.67 -> libicudata.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicudata.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicui18n.so -> libicui18n.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicui18n.so.67 -> libicui18n.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicui18n.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicuio.so -> libicuio.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicuio.so.67 -> libicuio.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicuio.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicutest.so -> libicutest.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicutest.so.67 -> libicutest.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicutest.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicutu.so -> libicutu.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicutu.so.67 -> libicutu.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicutu.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicuuc.so -> libicuuc.so.67.1
+lrwxrwxrwx     root/root       usr/lib/libicuuc.so.67 -> libicuuc.so.67.1
+-rwxr-xr-x     root/root       usr/lib/libicuuc.so.67.1
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/icu-i18n.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/icu-io.pc
@@ -239,12 +239,12 @@ drwxr-xr-x        root/root       usr/sbin/
 -rwxr-xr-x     root/root       usr/sbin/icupkg
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/icu/
-drwxr-xr-x     root/root       usr/share/icu/65.1/
--rw-r--r--     root/root       usr/share/icu/65.1/LICENSE
-drwxr-xr-x     root/root       usr/share/icu/65.1/config/
--rw-r--r--     root/root       usr/share/icu/65.1/config/mh-linux
--rwxr-xr-x     root/root       usr/share/icu/65.1/install-sh
--rwxr-xr-x     root/root       usr/share/icu/65.1/mkinstalldirs
+drwxr-xr-x     root/root       usr/share/icu/67.1/
+-rw-r--r--     root/root       usr/share/icu/67.1/LICENSE
+drwxr-xr-x     root/root       usr/share/icu/67.1/config/
+-rw-r--r--     root/root       usr/share/icu/67.1/config/mh-linux
+-rwxr-xr-x     root/root       usr/share/icu/67.1/install-sh
+-rwxr-xr-x     root/root       usr/share/icu/67.1/mkinstalldirs
 drwxr-xr-x     root/root       usr/share/man/
 drwxr-xr-x     root/root       usr/share/man/man1/
 -rw-r--r--     root/root       usr/share/man/man1/derb.1.gz

diff --git a/icu/.signature b/icu/.signature
index 205bb1eef6a9cc7c62d4a8bc965c55b1cc100fda..303bd52acc495d4ef5961f9b2100400c145b8874 100644 (file)
--- a/icu/.signature
+++ b/icu/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt-arm.pub
-RWQh9Dk2FlLauN6qHXVlYF8BXzNY4TDpZV2hXv3SFleuJM/MivSKLPcI3jc9iN6ckyKRNFVs0rW+yYVcwyI75ynZ8wFcOoQgNAc=
-SHA256 (Pkgfile) = c593e7dc0bc8c4e18da820ac7e0cd165ffe0621aa3c1fb3e471f15e61af6cc09
-SHA256 (.footprint) = 575e839241a9f7011af23ab46d8400cda2281acbdf7a3cd27af2e7682065015a
-SHA256 (icu4c-65_1-src.tgz) = 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
-SHA256 (icu-65.1-initialized-buffer-uloc_getKeywordValue.patch) = 2fafe710a69e0e81f38c8a36fcc17fa494ce27af63ea41d23815b36b1ee319c3
+RWQh9Dk2FlLauCg6IR6QHCptnsk98L0Tbfq6gUptACeqLtIHSOs8IDDtOAn6vcXIqmcos1r088x063mIXFJ9sJHfjtbk4x4zEQ8=
+SHA256 (Pkgfile) = 420e855bb58e4af593bdc13d79c9a47b8125899b637003e5f8bb4bf6b444a415
+SHA256 (.footprint) = 906027b72b5d9f23d428d66117274311b00fb81cfd91fb532d4f6b7292d65f98
+SHA256 (icu4c-67_1-src.tgz) = 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+SHA256 (icudata-stdlibs.patch) = 9633727d1875b90e87d0a6d8b727fb926a4f831e4c8f1e2c4f3eb24b08097153

diff --git a/icu/Pkgfile b/icu/Pkgfile
index bad3726e2d709036974f7a633d2b71422e360086..9ecf262e9f565871fb4e2d2272e8d07c70a3e63e 100644 (file)
--- a/icu/Pkgfile
+++ b/icu/Pkgfile
@@ -5,25 +5,23 @@
 # Packager: Younes Hafri, ycrux at club-internet dot fr
 
 name=icu
-version=65.1
+version=67.1
 release=1
 source=(https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version/./_}-src.tgz
-        icu-65.1-initialized-buffer-uloc_getKeywordValue.patch)
+        icudata-stdlibs.patch)
 
 build() {
   cd icu/source
 
-  # https://unicode-org.atlassian.net/browse/ICU-20884
-  patch -p2 -d .. -i $SRC/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch
+  patch -p2 -i $SRC/icudata-stdlibs.patch
 
   # icu tries to use clang by default
   [ "$CC" ] || export CC=gcc
   [ "$CXX" ] || export CXX=g++
 
-  sed -i -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" config/mh-linux
-
   ./configure \
     --prefix=/usr \
+    --mandir=/usr/share/man \
     --disable-samples \
     --disable-tests
 

diff --git a/icu/icudata-stdlibs.patch b/icu/icudata-stdlibs.patch
new file mode 100644 (file)
index 0000000..64bc1cd
--- /dev/null
+++ b/icu/icudata-stdlibs.patch
@@ -0,0 +1,15 @@
+Index: icu-52~m1/source/config/mh-linux
+===================================================================
+--- icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400
++++ icu-52~m1/source/config/mh-linux  2013-09-14 18:53:23.284040467 -0400
+@@ -21,7 +21,9 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
++# Debian change: linking icudata as data only causes too many problems.
++LDFLAGSICUDT=
+ 
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.