icu: 74.1 -> 74.2
This commit is contained in:
parent
02b8c660c2
commit
4cc0438b65
GPG Key ID:
42F8B4E30B673606
@ -213,30 +213,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/74.1/
|
||||
-rw-r--r-- root/root usr/lib/icu/74.1/Makefile.inc
|
||||
-rw-r--r-- root/root usr/lib/icu/74.1/pkgdata.inc
|
||||
drwxr-xr-x root/root usr/lib/icu/74.2/
|
||||
-rw-r--r-- root/root usr/lib/icu/74.2/Makefile.inc
|
||||
-rw-r--r-- root/root usr/lib/icu/74.2/pkgdata.inc
|
||||
lrwxrwxrwx root/root usr/lib/icu/Makefile.inc -> current/Makefile.inc
|
||||
lrwxrwxrwx root/root usr/lib/icu/current -> 74.1
|
||||
lrwxrwxrwx root/root usr/lib/icu/current -> 74.2
|
||||
lrwxrwxrwx root/root usr/lib/icu/pkgdata.inc -> current/pkgdata.inc
|
||||
lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicudata.so.74 -> libicudata.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicudata.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicui18n.so.74 -> libicui18n.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicui18n.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicuio.so.74 -> libicuio.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicuio.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicutest.so.74 -> libicutest.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicutest.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicutu.so.74 -> libicutu.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicutu.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicuuc.so.74 -> libicuuc.so.74.1
|
||||
-rwxr-xr-x root/root usr/lib/libicuuc.so.74.1
|
||||
lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicudata.so.74 -> libicudata.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicudata.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicui18n.so.74 -> libicui18n.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicui18n.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicuio.so.74 -> libicuio.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicuio.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicutest.so.74 -> libicutest.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicutest.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicutu.so.74 -> libicutu.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicutu.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.74.2
|
||||
lrwxrwxrwx root/root usr/lib/libicuuc.so.74 -> libicuuc.so.74.2
|
||||
-rwxr-xr-x root/root usr/lib/libicuuc.so.74.2
|
||||
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
|
||||
@ -250,12 +250,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/74.1/
|
||||
-rw-r--r-- root/root usr/share/icu/74.1/LICENSE
|
||||
drwxr-xr-x root/root usr/share/icu/74.1/config/
|
||||
-rw-r--r-- root/root usr/share/icu/74.1/config/mh-linux
|
||||
-rwxr-xr-x root/root usr/share/icu/74.1/install-sh
|
||||
-rwxr-xr-x root/root usr/share/icu/74.1/mkinstalldirs
|
||||
drwxr-xr-x root/root usr/share/icu/74.2/
|
||||
-rw-r--r-- root/root usr/share/icu/74.2/LICENSE (EMPTY)
|
||||
drwxr-xr-x root/root usr/share/icu/74.2/config/
|
||||
-rw-r--r-- root/root usr/share/icu/74.2/config/mh-linux
|
||||
-rwxr-xr-x root/root usr/share/icu/74.2/install-sh
|
||||
-rwxr-xr-x root/root usr/share/icu/74.2/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
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/Xla2rqWHaEp6DImVzpZ47im9M6M+kgPExllKzb1WhkR653ktrBzrDajLapK1X6eZ/SgvCWPDtRm2UakbrspHAs=
|
||||
SHA256 (Pkgfile) = 8d82ce0e0630039e7d15d526f5ccf998fe844ea3429ce70bd87c39b410edc946
|
||||
SHA256 (.footprint) = c1f4be6685453a889c212ab5cbb42642e804a70da04d301692fab8659400ecb9
|
||||
SHA256 (icu4c-74_1-src.tgz) = 86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0
|
||||
RWSE3ohX2g5d/f0sqU+2lownmmwGgn0NSBnso8DT0lyK/AgVxEc0kektKya0MbvT2v/DKlOiZzfvBqiiMCe4AS0CxoQJrqxpWgg=
|
||||
SHA256 (Pkgfile) = 902bccc42e3b01aa74b1d2534228fbff1b9b96933a69362d2b437d310d1b5472
|
||||
SHA256 (.footprint) = b9197cec990e76886d5396856989bc9c327c82277d21c1f70a9a03c569869a9a
|
||||
SHA256 (icu4c-74_2-src.tgz) = 5e4fb11d6a3e6b85afb55de8da8a71538f1d8fd64fce893986b37d60e5bb0091
|
||||
SHA256 (ICU-22132.patch) = f534b472dd7a6961591466eef542e2c3ad698d3008c9b6af813c66cbc0b4dd8e
|
||||
|
||||
25
icu/ICU-22132.patch
Normal file
25
icu/ICU-22132.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff -u a/i18n/vtzone.cpp a/i18n/vtzone.cpp
|
||||
--- a/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100
|
||||
+++ b/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100
|
||||
@@ -1735,14 +1735,14 @@
|
||||
}
|
||||
}
|
||||
} else {
|
||||
- UnicodeString icutzprop;
|
||||
- UVector customProps(nullptr, uhash_compareUnicodeString, status);
|
||||
+ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
|
||||
if (olsonzid.length() > 0 && icutzver.length() > 0) {
|
||||
- icutzprop.append(olsonzid);
|
||||
- icutzprop.append(u'[');
|
||||
- icutzprop.append(icutzver);
|
||||
- icutzprop.append(u']');
|
||||
- customProps.addElement(&icutzprop, status);
|
||||
+ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
|
||||
+ icutzprop->append(olsonzid);
|
||||
+ icutzprop->append(u'[');
|
||||
+ icutzprop->append(icutzver);
|
||||
+ icutzprop->append(u']');
|
||||
+ customProps.adoptElement(icutzprop.orphan(), status);
|
||||
}
|
||||
writeZone(writer, *tz, &customProps, status);
|
||||
}
|
||||
10
icu/Pkgfile
10
icu/Pkgfile
@ -4,9 +4,10 @@
|
||||
# Optional: clang lld
|
||||
|
||||
name=icu
|
||||
version=74.1
|
||||
version=74.2
|
||||
release=1
|
||||
source=(https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version/./_}-src.tgz)
|
||||
source=(https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version/./_}-src.tgz
|
||||
ICU-22132.patch)
|
||||
|
||||
build() {
|
||||
cd icu/source
|
||||
@ -16,12 +17,17 @@ build() {
|
||||
prt-get isinst clang && export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib || \
|
||||
export CC=gcc CXX=g++
|
||||
|
||||
patch -Np1 -i $SRC/ICU-22132.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/share/man \
|
||||
--disable-samples \
|
||||
--disable-tests
|
||||
|
||||
# https://github.com/unicode-org/icu/blob/main/icu4c/LICENSE does not seem to work
|
||||
touch ../LICENSE
|
||||
|
||||
make
|
||||
make -j1 DESTDIR=$PKG install
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user