From b6e1ff3a218238df82bd06358d635cdc8b60237e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 6 Jan 2023 15:46:37 +0200
Subject: [PATCH 16/16] installer_cross: Ignore 'attributes' errors in C++
 builds

Qt headers cause such warnings with newer g++

See osdn #46428

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/winbuild.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index 72941315f2..562aa6fd92 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -58,6 +58,10 @@ fi
 
 SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//')
 
+# Make this Qt-client/Ruledit specific as upstream updates
+# to Qt headers allow. Currently needed in both cases.
+CXXFLAGS="-Wno-error=attributes"
+
 if test "x$2" = "xruledit" ; then
   SINGLE_GUI=true
   GUIP="-ruledit"
@@ -168,6 +172,7 @@ if ! ../../../configure \
      FREECIV_LABEL_FORCE="<base>-crs" \
      CPPFLAGS="-I${DLLSPATH}/include -D_WIN32_WINNT=${MIN_WINVER}" \
      CFLAGS="-Wno-error" \
+     CXXFLAGS="${CXXFLAGS}" \
      PKG_CONFIG_LIBDIR="${DLLSPATH}/lib/pkgconfig" \
      --enable-sys-tolua-cmd \
      --with-magickwand="${DLLSPATH}/bin" \
-- 
2.39.0