From 40fdb7370c946426d226c2c33a28d9b79f9dee4e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 13 Jun 2023 12:59:07 +0200
Subject: Release version 1.2.1200+3

Suppress -Wdeprecated-non-prototype Clang 15 warning.
---
 libz/README-DEV               |  4 ++++
 libz/libz/buildfile           | 16 ++++++++++++----
 libz/manifest                 |  2 +-
 libz/tests/minigzip/buildfile | 12 +++++++++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/libz/README-DEV b/libz/README-DEV
index aa7874f..79d7ad1 100644
--- a/libz/README-DEV
+++ b/libz/README-DEV
@@ -1,3 +1,7 @@
+TODO:
+
+  - Try to re-enable warnings in case fixed.
+
 This document describes how libz 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 zlib packaging.
diff --git a/libz/libz/buildfile b/libz/libz/buildfile
index 15939d5..3851db4 100644
--- a/libz/libz/buildfile
+++ b/libz/libz/buildfile
@@ -57,12 +57,20 @@ switch $c.class
     # way that works across compilers/version (some -Wno-* options are only
     # recognized in newer versions).
     #
+    # @@ TMP: try to re-enable on next release.
+    #
     c.coptions += -Wno-all -Wno-extra
 
-    # Disable the Clang targeting MSVC warnings.
-    #
-    if ($c.id == 'clang' && $tsys == 'win32-msvc')
-      c.coptions += -Wno-deprecated-declarations
+    if ($c.id == 'clang')
+    {
+      if ($c.version.major >= 15)
+        c.coptions += -Wno-deprecated-non-prototype
+
+      # Disable the Clang targeting MSVC warnings.
+      #
+      if ($tsys == 'win32-msvc')
+        c.coptions += -Wno-deprecated-declarations
+    }
   }
   case 'msvc'
   {
diff --git a/libz/manifest b/libz/manifest
index 594e26e..67535dc 100644
--- a/libz/manifest
+++ b/libz/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libz
-version: 1.2.1200+2
+version: 1.2.1200+3
 upstream-version: 1.2.12
 project: zlib
 priority: security
diff --git a/libz/tests/minigzip/buildfile b/libz/tests/minigzip/buildfile
index 660d759..9419fa1 100644
--- a/libz/tests/minigzip/buildfile
+++ b/libz/tests/minigzip/buildfile
@@ -5,9 +5,15 @@ import libs = libz%lib{z}
 
 exe{driver}: {h c}{*} $libs testscript
 
-# Disable MSVC warnings that pop up with /W3 and Clang/MSVC warnings.
+# Disable MSVC warnings that pop up with /W3 and Clang warnings.
 #
 if ($c.class == 'msvc')
   c.coptions += /wd4267 /wd4996
-elif ($c.id == 'clang' && $c.target.system == 'win32-msvc')
-  c.coptions += -Wno-deprecated-declarations
+elif ($c.id == 'clang')
+{
+  if ($c.version.major >= 15)
+    c.coptions += -Wno-deprecated-non-prototype
+
+  if ($c.target.system == 'win32-msvc')
+    c.coptions += -Wno-deprecated-declarations
+}
-- 
cgit v1.1