From 5c33d1b7380436104053d93cbff98eef88fb4f1b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 5 Jul 2023 15:41:58 +0300
Subject: Release version 65.1.0+8

Suppress some Clang and MSVC warnings.

Fix dist operation 'multiple files are distributed as ...' warning.
---
 libicui18n/libicui18n/buildfile |  2 +-
 libicui18n/manifest             |  2 +-
 libicuio/libicuio/buildfile     | 10 ++++++++++
 libicuio/manifest               |  4 ++--
 libicuuc/libicu/buildfile       | 16 +++++++++++-----
 libicuuc/manifest               |  2 +-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/libicui18n/libicui18n/buildfile b/libicui18n/libicui18n/buildfile
index fcddedf..edd8676 100644
--- a/libicui18n/libicui18n/buildfile
+++ b/libicui18n/libicui18n/buildfile
@@ -71,7 +71,7 @@ switch $cxx.class
 
     # Disable warnings that pop up with /W3.
     #
-    cxx.coptions += /wd4244 /wd4996
+    cxx.coptions += /wd4244 /wd4996 /wd5055 /wd5056
   }
 }
 
diff --git a/libicui18n/manifest b/libicui18n/manifest
index 0bd114a..f840d6a 100644
--- a/libicui18n/manifest
+++ b/libicui18n/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicui18n
-version: 65.1.0+7
+version: 65.1.0+8
 upstream-version: 65.1
 project: icu
 summary: ICU high-level internationalization C/C++ library
diff --git a/libicuio/libicuio/buildfile b/libicuio/libicuio/buildfile
index baab1c4..a400b40 100644
--- a/libicuio/libicuio/buildfile
+++ b/libicuio/libicuio/buildfile
@@ -49,8 +49,18 @@ obja{*}: cxx.poptions += -DU_STATIC_IMPLEMENTATION
 switch $cxx.class
 {
   case 'gcc'
+  {
     cxx.coptions += -fvisibility=hidden
 
+    # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem
+    # to care about these and it is not easy to disable specific warnings in a
+    # way that works across compilers/version (some -Wno-* options are only
+    # recognized in newer versions). There are still some warnings left that
+    # appear for certain platforms/compilers. We pass them through but disable
+    # treating them as errors.
+    #
+    cxx.coptions += -Wno-all -Wno-extra -Wno-error
+  }
   case 'msvc'
     cxx.coptions += /utf-8 /Zc:wchar_t /GF /Gy \
                     /wd4996 # Disable warnings that pop up with /W3.
diff --git a/libicuio/manifest b/libicuio/manifest
index cb5c784..da7275b 100644
--- a/libicuio/manifest
+++ b/libicuio/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuio
-version: 65.1.0+7
+version: 65.1.0+8
 upstream-version: 65.1
 project: icu
 summary: ICU input/output C/C++ library
@@ -13,7 +13,7 @@ src-url: https://git.build2.org/cgit/packaging/icu/icu/tree/libicuio/
 package-url: https://git.build2.org/cgit/packaging/icu/
 email: icu-support@lists.sourceforge.net ; Mailing list.
 package-email: packaging@build2.org      ; Mailing list.
-build-warning-email: builds@build2.org
+build-error-email: builds@build2.org
 builds: all
 depends: * build2 >= 0.12.0
 depends: * bpkg >= 0.12.0
diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile
index ce96b5b..ca8e05c 100644
--- a/libicuuc/libicu/buildfile
+++ b/libicuuc/libicu/buildfile
@@ -5,7 +5,13 @@
 
 patched = putil ucasemap uniset unistr
 
-lib{icuuc}: uc/hxx{**} uc/cxx{* -{$patched}} cxx{$patched} lib{icudata}
+# Note that some of the uc/unicode/*.h files are C++ headers and some are C
+# headers. We will assume all of them as C headers, which is a bit of a hack
+# but doing it properly is too painful.
+#
+lib{icuuc}: uc/hxx{** -unicode/*} uc/unicode/h{*} \
+            uc/cxx{* -{$patched}} cxx{$patched}   \
+            lib{icudata}
 
 lib{icudata}: data/{h c}{*} uc/unicode/h{*}
 
@@ -69,7 +75,7 @@ switch $c.class
 {
   case 'gcc'
   {
-    cc.coptions  += -fvisibility=hidden
+    cc.coptions += -fvisibility=hidden
 
     # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem
     # to care about these and it is not easy to disable specific warnings in a
@@ -167,6 +173,6 @@ else
 
 # Install headers from the uc/unicode/ subdirectory only.
 #
-h{*}:              install = false
-hxx{*}:            install = false
-uc/unicode/hxx{*}: install = include/unicode/
+h{*}:            install = false
+hxx{*}:          install = false
+uc/unicode/h{*}: install = include/unicode/
diff --git a/libicuuc/manifest b/libicuuc/manifest
index 317dbfc..5350fe2 100644
--- a/libicuuc/manifest
+++ b/libicuuc/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuuc
-version: 65.1.0+7
+version: 65.1.0+8
 upstream-version: 65.1
 project: icu
 summary: ICU basic internationalization C/C++ library
-- 
cgit v1.1