Release version 65.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
build2-packaging · Nov 22, 2021 · 2148e5c · 2148e5c
1 parent 92aadc4
commit 2148e5c
Show file tree

Hide file tree

Showing 42 changed files with 2,472 additions and 46 deletions.
diff --git a/libicui18n/.gitignore b/libicui18n/.gitignore
@@ -3,9 +3,14 @@
 *.d
 *.t
 *.i
+*.i.*
 *.ii
+*.ii.*
 *.o
 *.obj
+*.gcm
+*.pcm
+*.ifc
 *.so
 *.so.*
 *.dll

diff --git a/libicui18n/build/bootstrap.build b/libicui18n/build/bootstrap.build
@@ -1,4 +1,4 @@
-# file      : build/root.build
+# file      : build/bootstrap.build
 # license   : Unicode License; see accompanying LICENSE file
 
 project = libicui18n

diff --git a/libicui18n/build/export.build b/libicui18n/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/libicui18n/libicui18n/.gitattributes b/libicui18n/libicui18n/.gitattributes
@@ -0,0 +1 @@
+i18n symlink=dir
diff --git a/libicui18n/manifest b/libicui18n/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicui18n
-version: 65.1.0+5
+version: 65.1.0+6
 upstream-version: 65.1
 project: icu
 summary: ICU high-level internationalization C/C++ library

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+io symlink=dir
diff --git 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
@@ -0,0 +1 @@
+../../upstream/icu4c/source/io
diff --git a/libicuio/libicuio/io/locbund.cpp b/libicuio/libicuio/io/locbund.cpp
diff --git a/libicuio/libicuio/io/locbund.h b/libicuio/libicuio/io/locbund.h
diff --git a/libicuio/libicuio/io/sprintf.cpp b/libicuio/libicuio/io/sprintf.cpp
diff --git a/libicuio/libicuio/io/sscanf.cpp b/libicuio/libicuio/io/sscanf.cpp
diff --git a/libicuio/libicuio/io/ucln_io.cpp b/libicuio/libicuio/io/ucln_io.cpp
diff --git a/libicuio/libicuio/io/ucln_io.h b/libicuio/libicuio/io/ucln_io.h
diff --git a/libicuio/libicuio/io/ufile.h b/libicuio/libicuio/io/ufile.h
diff --git a/libicuio/libicuio/io/ufmt_cmn.cpp b/libicuio/libicuio/io/ufmt_cmn.cpp
diff --git a/libicuio/libicuio/io/ufmt_cmn.h b/libicuio/libicuio/io/ufmt_cmn.h
diff --git a/libicuio/libicuio/io/unicode b/libicuio/libicuio/io/unicode
diff --git a/libicuio/libicuio/io/uprintf.cpp b/libicuio/libicuio/io/uprintf.cpp
diff --git a/libicuio/libicuio/io/uprintf.h b/libicuio/libicuio/io/uprintf.h
diff --git a/libicuio/libicuio/io/uprntf_p.cpp b/libicuio/libicuio/io/uprntf_p.cpp
diff --git a/libicuio/libicuio/io/uscanf.cpp b/libicuio/libicuio/io/uscanf.cpp
diff --git a/libicuio/libicuio/io/uscanf.h b/libicuio/libicuio/io/uscanf.h
diff --git a/libicuio/libicuio/io/uscanf_p.cpp b/libicuio/libicuio/io/uscanf_p.cpp
diff --git a/libicuio/libicuio/io/ustdio.cpp b/libicuio/libicuio/io/ustdio.cpp
diff --git a/libicuio/libicuio/io/ustream.cpp b/libicuio/libicuio/io/ustream.cpp
diff --git a/libicuio/libicuio/io/ufile.cpp → libicuio/libicuio/ufile.cpp b/libicuio/libicuio/io/ufile.cpp → libicuio/libicuio/ufile.cpp
diff --git a/libicuio/libicuio/io/ufile.cpp.patch → libicuio/libicuio/ufile.cpp.patch b/libicuio/libicuio/io/ufile.cpp.patch → 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
@@ -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

diff --git a/libicuuc/.gitignore b/libicuuc/.gitignore
@@ -3,9 +3,14 @@
 *.d
 *.t
 *.i
+*.i.*
 *.ii
+*.ii.*
 *.o
 *.obj
+*.gcm
+*.pcm
+*.ifc
 *.so
 *.so.*
 *.dll

diff --git a/libicuuc/README-DEV b/libicuuc/README-DEV
@@ -20,6 +20,11 @@ upstream's fix (commit b7d08bc04a4296982fcef8b6b8a354a9e4e7afca) as a base
 $ cp libicu/uc/unistr.cpp libicu
 $ patch -p0 <libicu/unistr.cpp.patch
 
+Also we fix the 'unable to find numeric literal operator' MinGW GCC 11 error:
+
+$ cp libicu/uc/putil.cpp libicu
+$ patch -p0 <libicu/putil.cpp.patch
+
 And we also fix Clang 10 compilation error:
 
 $ cp libicu/uc/uniset.cpp libicu

diff --git a/libicuuc/build/bootstrap.build b/libicuuc/build/bootstrap.build
@@ -1,4 +1,4 @@
-# file      : build/root.build
+# file      : build/bootstrap.build
 # license   : Unicode License; see accompanying LICENSE file
 
 project = libicuuc
@@ -24,7 +24,7 @@ using dist
 # icu4c/source/configure.ac). The ABI compatibility is preserved for the
 # shared updates. See also:
 #
-# http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU
+# https://unicode-org.github.io/icu/userguide/icu/design.html#version-numbers-in-icu
 #
 abi_version_major = "$version.major"
 abi_version_patch = ($version.patch != 0 ? ".$version.patch" : "")

diff --git a/libicuuc/build/export.build b/libicuuc/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/libicuuc/libicu/.gitattributes b/libicuuc/libicu/.gitattributes
@@ -0,0 +1 @@
+uc symlink=dir
diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile
@@ -3,7 +3,7 @@
 
 ./: lib{icuuc} lib{icudata}
 
-patched = ucasemap unistr uniset
+patched = putil ucasemap uniset unistr
 
 lib{icuuc}: uc/hxx{**} uc/cxx{* -{$patched}} cxx{$patched} lib{icudata}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,14 @@ @@
     *.d
     *.t
     *.i
+    *.i.*
     *.ii
+    *.ii.*
     *.o
     *.obj
+    *.gcm
+    *.pcm
+    *.ifc
     *.so
     *.so.*
     *.dll
@@ Expand Down @@