From a2b2beb8c5f0703226476718435fc49df5de7502 Mon Sep 17 00:00:00 2001
From: Dean Brettle <dean@brettle.com>
Date: Mon, 29 Jul 2024 07:48:36 -0700
Subject: [PATCH] Fix windows nightly build (#6586)

* Remove qwindowsvistastyle.dll which isn't installed.

* Don't fail silently when trying to build windows distro.

* Ignore false warning produced by recent GCC version.

* Only suppress warning for versions of GCC where it exists.

* Revert to single quotes.
---
 scripts/packaging/files_msys64.txt    | 1 -
 scripts/packaging/windows_distro.py   | 4 +++-
 src/webots/maths/WbMathsUtilities.cpp | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/packaging/files_msys64.txt b/scripts/packaging/files_msys64.txt
index da0973f9162..9926518a30b 100644
--- a/scripts/packaging/files_msys64.txt
+++ b/scripts/packaging/files_msys64.txt
@@ -33,7 +33,6 @@
 /mingw64/share/qt6/plugins/imageformats/qjpeg.dll
 /mingw64/bin/libjpeg-8.dll
 /mingw64/share/qt6/plugins/platforms/qwindows.dll
-/mingw64/share/qt6/plugins/styles/qwindowsvistastyle.dll
 /mingw64/share/qt6/plugins/tls/qcertonlybackend.dll
 /mingw64/share/qt6/plugins/tls/qopensslbackend.dll
 /mingw64/share/qt6/plugins/tls/qschannelbackend.dll
diff --git a/scripts/packaging/windows_distro.py b/scripts/packaging/windows_distro.py
index 9b07f5be493..8179153c9c7 100644
--- a/scripts/packaging/windows_distro.py
+++ b/scripts/packaging/windows_distro.py
@@ -205,7 +205,9 @@ def create_webots_bundle(self, include_commit_file):
         else:
             INNO_SETUP_HOME = "/C/Program Files (x86)/Inno Setup 6"
         print('creating webots_setup.exe (takes long)\n')
-        subprocess.run([INNO_SETUP_HOME + '/iscc', '-Q', 'webots.iss'])
+        subprocess.run(
+            [INNO_SETUP_HOME + '/iscc', '-Q', 'webots.iss']
+        ).check_returncode()
 
         print('Done.')
 
diff --git a/src/webots/maths/WbMathsUtilities.cpp b/src/webots/maths/WbMathsUtilities.cpp
index edfcf16d43a..fcbff381dfa 100644
--- a/src/webots/maths/WbMathsUtilities.cpp
+++ b/src/webots/maths/WbMathsUtilities.cpp
@@ -107,7 +107,13 @@ int WbMathsUtilities::convexHull(const QVector<WbVector2> &points, QVector<int>
       iMin = i;
   }
 
+  // Ignore false positive warning produced by some versions of GCC.
+#pragma GCC diagnostic push
+#if __GNUC__ >= 7
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
   QVector<int> index(size);
+#pragma GCC diagnostic pop
   for (i = 0; i < size; ++i)
     index[i] = i;