File 0001-Fix-building-with-gcc-13.patch of Package mingw64-libqt5-qtbase
From 85b315f0adc2ac32be1f4c8e757a68a7929f84ab Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 29 May 2024 16:43:50 +0200
Subject: [PATCH] Fix building with gcc 13
---
src/3rdparty/angle/include/GLSLANG/ShaderVars.h | 1 +
src/3rdparty/angle/src/libANGLE/Error.h | 4 ++++
src/3rdparty/angle/src/libANGLE/Error.inl | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/src/3rdparty/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
index 709428aeb..cd1de0aae 100644
--- a/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
+++ b/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
@@ -14,6 +14,7 @@
#include <array>
#include <string>
#include <vector>
+#include <cstdint>
// This type is defined here to simplify ANGLE's integration with glslang for SPIRv.
using ShCompileOptions = uint64_t;
diff --git a/src/3rdparty/angle/src/libANGLE/Error.h b/src/3rdparty/angle/src/libANGLE/Error.h
index 1d57bb870..ee5e72b82 100644
--- a/src/3rdparty/angle/src/libANGLE/Error.h
+++ b/src/3rdparty/angle/src/libANGLE/Error.h
@@ -90,7 +90,9 @@ class ANGLE_NO_DISCARD Error final
inline ~Error() = default;
// automatic error type conversion
+#ifndef __MINGW32__
inline Error(egl::Error &&eglErr);
+#endif
inline Error(egl::Error eglErr);
inline Error &operator=(const Error &other);
@@ -161,7 +163,9 @@ class ANGLE_NO_DISCARD Error final
inline ~Error() = default;
// automatic error type conversion
+#ifndef __MINGW32__
inline Error(gl::Error &&glErr);
+#endif
inline Error(gl::Error glErr);
inline Error &operator=(const Error &other);
diff --git a/src/3rdparty/angle/src/libANGLE/Error.inl b/src/3rdparty/angle/src/libANGLE/Error.inl
index 4632830ce..16805d4c0 100644
--- a/src/3rdparty/angle/src/libANGLE/Error.inl
+++ b/src/3rdparty/angle/src/libANGLE/Error.inl
@@ -38,12 +38,14 @@ Error::Error(Error &&other)
}
// automatic error type conversion
+#ifndef __MINGW32__
Error::Error(egl::Error &&eglErr)
: mCode(GL_INVALID_OPERATION),
mID(0),
mMessage(std::move(eglErr.mMessage))
{
}
+#endif
Error::Error(egl::Error eglErr)
: mCode(GL_INVALID_OPERATION),
@@ -127,12 +129,14 @@ Error::Error(Error &&other)
}
// automatic error type conversion
+#ifndef __MINGW32__
Error::Error(gl::Error &&glErr)
: mCode(EGL_BAD_ACCESS),
mID(0),
mMessage(std::move(glErr.mMessage))
{
}
+#endif
Error::Error(gl::Error glErr)
: mCode(EGL_BAD_ACCESS),
--
2.44.0