File qt-5.12.12-fix-compiling-with-gcc13.patch of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File qt-5.12.12-fix-compiling-with-gcc13.patch of Package mingw32-libqt5-qtbase (Revision efced71e8f7e307e1b258b527669b69a)

Currently displaying revision efced71e8f7e307e1b258b527669b69a , Show latest

From 0274c278957e99999c60309e49f7a7eabfc75ebd Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 23 Nov 2023 00:00:19 +0100
Subject: [PATCH] Fix building with MinGW gcc13

This commit fixes the following build errors:

src/3rdparty/angle/include/GLSLANG/ShaderVars.h:19:26:
       error: 'uint64_t' does not name a type

src/3rdparty/angle/src/libANGLE/Error.h:231:18:
    error: conversion from 'gl::Error' to 'egl::Error' is ambiguous
---
 src/3rdparty/angle/include/GLSLANG/ShaderVars.h | 1 +
 src/3rdparty/angle/src/libANGLE/Error.h         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/3rdparty/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
index 709428aebf..44f183e4f8 100644
--- a/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
+++ b/src/3rdparty/angle/include/GLSLANG/ShaderVars.h
@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/3rdparty/angle/src/libANGLE/Error.h b/src/3rdparty/angle/src/libANGLE/Error.h
index 1d57bb8707..d52cba0ee9 100644
--- a/src/3rdparty/angle/src/libANGLE/Error.h
+++ b/src/3rdparty/angle/src/libANGLE/Error.h
@@ -90,7 +90,7 @@ class ANGLE_NO_DISCARD Error final
     inline ~Error() = default;
 
     // automatic error type conversion
-    inline Error(egl::Error &&eglErr);
+    explicit inline Error(egl::Error &&eglErr);
     inline Error(egl::Error eglErr);
 
     inline Error &operator=(const Error &other);
@@ -161,7 +161,7 @@ class ANGLE_NO_DISCARD Error final
     inline ~Error() = default;
 
     // automatic error type conversion
-    inline Error(gl::Error &&glErr);
+    explicit inline Error(gl::Error &&glErr);
     inline Error(gl::Error glErr);
 
     inline Error &operator=(const Error &other);
-- 
2.35.3

Places

File qt-5.12.12-fix-compiling-with-gcc13.patch of Package mingw32-libqt5-qtbase (Revision efced71e8f7e307e1b258b527669b69a)

Places