diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2021-11-22 16:06:11 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-11-22 16:06:11 +0300 |
commit | 2148e5c2a936b7bd6f7582b0a3b20e2d4b842502 (patch) | |
tree | e9b53c3218f57966ee38e7301fe64faedbe884b7 /libicuio | |
parent | 92aadc4b3a221b68527478e9459a01860a0db903 (diff) |
Release version 65.1.0+6v65.1.0+6
Fix 'unable to find numeric literal operator' MinGW GCC 11 error
Fix outdated URL in comment in libicuuc/build/bootstrap.build
Update .gitignore
Add symlink attribute for symbolic links that refer to upstream subdirectories
Redo libicuio patch to align with libicuuc patches
Diffstat (limited to 'libicuio')
28 files changed, 20 insertions, 38 deletions
diff --git a/libicuio/.gitignore b/libicuio/.gitignore index 4c4fec7..3dcc22f 100644 --- a/libicuio/.gitignore +++ b/libicuio/.gitignore @@ -3,9 +3,14 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so *.so.* *.dll diff --git a/libicuio/README-DEV b/libicuio/README-DEV index 733d50b..8cd01d9 100644 --- a/libicuio/README-DEV +++ b/libicuio/README-DEV @@ -2,18 +2,11 @@ This document describes how libicuio was packaged for build2. In particular, this understanding will be useful when upgrading to a new upstream version. See ../README-DEV for general notes on ICU packaging. -Symlink the required upstream files and directories into libicuio/io/ and -apply a patch that fixes the 'unable to find numeric literal operator' GCC 11 -error: +Symlink the required upstream directories into libicuio/: -$ mkdir libicuio/io -$ pushd libicuio/io -$ ln -s ../../../upstream/icu4c/source/io/{*.{h,cpp},unicode} ./ -$ rm ufile.cpp -$ cp ../../../upstream/icu4c/source/io/ufile.cpp ./ -$ git apply ufile.cpp.patch -$ popd +$ ln -s ../../upstream/icu4c/source/io libicuio -Note that the patch is produces by the following command: +Fix the 'unable to find numeric literal operator' GCC 11 error: -$ git diff >ufile.cpp.patch +$ cp libicuio/io/ufile.cpp libicuio +$ patch -p0 <libicuio/ufile.cpp.patch diff --git a/libicuio/build/bootstrap.build b/libicuio/build/bootstrap.build index ef574c9..06b4637 100644 --- a/libicuio/build/bootstrap.build +++ b/libicuio/build/bootstrap.build @@ -1,4 +1,4 @@ -# file : build/root.build +# file : build/bootstrap.build # license : Unicode License; see accompanying LICENSE file project = libicuio diff --git a/libicuio/build/export.build b/libicuio/build/export.build index d40d387..a7e9429 100644 --- a/libicuio/build/export.build +++ b/libicuio/build/export.build @@ -1,4 +1,4 @@ -# file : build/root.build +# file : build/export.build # license : Unicode License; see accompanying LICENSE file $out_root/ diff --git a/libicuio/libicuio/.gitattributes b/libicuio/libicuio/.gitattributes new file mode 100644 index 0000000..2a80cb7 --- /dev/null +++ b/libicuio/libicuio/.gitattributes @@ -0,0 +1 @@ +io symlink=dir diff --git a/libicuio/libicuio/buildfile b/libicuio/libicuio/buildfile index 4494395..baab1c4 100644 --- a/libicuio/libicuio/buildfile +++ b/libicuio/libicuio/buildfile @@ -4,7 +4,9 @@ import intf_libs = libicui18n%lib{icui18n} import intf_libs += libicuuc%lib{icuuc} -lib{icuio}: {hxx cxx}{**} $intf_libs +patched = ufile + +lib{icuio}: io/hxx{**} io/cxx{** -{$patched}} cxx{$patched} $intf_libs tclass = $cxx.target.class tsys = $cxx.target.system diff --git a/libicuio/libicuio/io b/libicuio/libicuio/io new file mode 120000 index 0000000..a9c6524 --- /dev/null +++ b/libicuio/libicuio/io @@ -0,0 +1 @@ +../../upstream/icu4c/source/io
\ No newline at end of file diff --git a/libicuio/libicuio/io/locbund.cpp b/libicuio/libicuio/io/locbund.cpp deleted file mode 120000 index fb931d8..0000000 --- a/libicuio/libicuio/io/locbund.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/locbund.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/locbund.h b/libicuio/libicuio/io/locbund.h deleted file mode 120000 index a6fe209..0000000 --- a/libicuio/libicuio/io/locbund.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/locbund.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/sprintf.cpp b/libicuio/libicuio/io/sprintf.cpp deleted file mode 120000 index c9ffa23..0000000 --- a/libicuio/libicuio/io/sprintf.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/sprintf.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/sscanf.cpp b/libicuio/libicuio/io/sscanf.cpp deleted file mode 120000 index ce22d1a..0000000 --- a/libicuio/libicuio/io/sscanf.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/sscanf.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ucln_io.cpp b/libicuio/libicuio/io/ucln_io.cpp deleted file mode 120000 index a859b8f..0000000 --- a/libicuio/libicuio/io/ucln_io.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ucln_io.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ucln_io.h b/libicuio/libicuio/io/ucln_io.h deleted file mode 120000 index 75581ff..0000000 --- a/libicuio/libicuio/io/ucln_io.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ucln_io.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/ufile.h b/libicuio/libicuio/io/ufile.h deleted file mode 120000 index 8b66131..0000000 --- a/libicuio/libicuio/io/ufile.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ufile.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/ufmt_cmn.cpp b/libicuio/libicuio/io/ufmt_cmn.cpp deleted file mode 120000 index c45c1dc..0000000 --- a/libicuio/libicuio/io/ufmt_cmn.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ufmt_cmn.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ufmt_cmn.h b/libicuio/libicuio/io/ufmt_cmn.h deleted file mode 120000 index 9f446f2..0000000 --- a/libicuio/libicuio/io/ufmt_cmn.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ufmt_cmn.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/unicode b/libicuio/libicuio/io/unicode deleted file mode 120000 index affdbc2..0000000 --- a/libicuio/libicuio/io/unicode +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/unicode
\ No newline at end of file diff --git a/libicuio/libicuio/io/uprintf.cpp b/libicuio/libicuio/io/uprintf.cpp deleted file mode 120000 index c733ad9..0000000 --- a/libicuio/libicuio/io/uprintf.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uprintf.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/uprintf.h b/libicuio/libicuio/io/uprintf.h deleted file mode 120000 index 89bf0ec..0000000 --- a/libicuio/libicuio/io/uprintf.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uprintf.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/uprntf_p.cpp b/libicuio/libicuio/io/uprntf_p.cpp deleted file mode 120000 index 5269327..0000000 --- a/libicuio/libicuio/io/uprntf_p.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uprntf_p.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/uscanf.cpp b/libicuio/libicuio/io/uscanf.cpp deleted file mode 120000 index 42692fd..0000000 --- a/libicuio/libicuio/io/uscanf.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uscanf.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/uscanf.h b/libicuio/libicuio/io/uscanf.h deleted file mode 120000 index 660b9c5..0000000 --- a/libicuio/libicuio/io/uscanf.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uscanf.h
\ No newline at end of file diff --git a/libicuio/libicuio/io/uscanf_p.cpp b/libicuio/libicuio/io/uscanf_p.cpp deleted file mode 120000 index f0eb6f7..0000000 --- a/libicuio/libicuio/io/uscanf_p.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/uscanf_p.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ustdio.cpp b/libicuio/libicuio/io/ustdio.cpp deleted file mode 120000 index 8dc47e8..0000000 --- a/libicuio/libicuio/io/ustdio.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ustdio.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ustream.cpp b/libicuio/libicuio/io/ustream.cpp deleted file mode 120000 index 91304b4..0000000 --- a/libicuio/libicuio/io/ustream.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/icu4c/source/io/ustream.cpp
\ No newline at end of file diff --git a/libicuio/libicuio/io/ufile.cpp b/libicuio/libicuio/ufile.cpp index 2c00d21..2c00d21 100644 --- a/libicuio/libicuio/io/ufile.cpp +++ b/libicuio/libicuio/ufile.cpp diff --git a/libicuio/libicuio/io/ufile.cpp.patch b/libicuio/libicuio/ufile.cpp.patch index b0e8acd..9397298 100644 --- a/libicuio/libicuio/io/ufile.cpp.patch +++ b/libicuio/libicuio/ufile.cpp.patch @@ -1,7 +1,5 @@ -diff --git a/libicuio/libicuio/io/ufile.cpp b/libicuio/libicuio/io/ufile.cpp -index 1d8c221..2c00d21 100644 ---- a/libicuio/libicuio/io/ufile.cpp -+++ b/libicuio/libicuio/io/ufile.cpp +--- libicuio/io/ufile.cpp 2019-12-23 14:38:40.255889178 +0300 ++++ libicuio/ufile.cpp 2021-11-22 10:50:17.658962827 +0300 @@ -21,12 +21,6 @@ */ diff --git a/libicuio/manifest b/libicuio/manifest index 4c1c8e8..c0eac20 100644 --- a/libicuio/manifest +++ b/libicuio/manifest @@ -1,6 +1,6 @@ : 1 name: libicuio -version: 65.1.0+5 +version: 65.1.0+6 upstream-version: 65.1 project: icu summary: ICU input/output C/C++ library |