diff --git a/recipes-qt/qt6/qtbase/0006-qnumeric-disable-use-of-stdckdint.h.patch b/recipes-qt/qt6/qtbase/0006-qnumeric-disable-use-of-stdckdint.h.patch deleted file mode 100644 index 2591b32..0000000 --- a/recipes-qt/qt6/qtbase/0006-qnumeric-disable-use-of-stdckdint.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d194661b728c0fa8c9d7ef6a8961b6eb7077ceb9 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Mon, 27 Oct 2025 13:11:00 +0000 -Subject: [PATCH] qnumeric: disable use of stdckdint.h - -Similar to GCC14 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121811), -GCC15 has problem using stdckdint.h in Yocto setup as default include -paths are ordered so that the C header is found first. - -| nativesdk-qtbase/6.11.0/sources/qtbase-6.11.0/src/corelib/global/qnumeric.h: In function 'constexpr std::enable_if_t<((bool)is_unsigned_v), bool> qAddOverflow(T, T, T*)': -| nativesdk-qtbase/6.11.0/sources/qtbase-6.11.0/src/corelib/global/qnumeric.h:282:12: error: '_Bool' was not declared in this scope [-Wtemplate-body] -| 282 | return ckd_add(r, v1, v2); -| | ^~~~~~~ - -Upstream-Status: Inappropriate [oe specific] -Change-Id: Ic158ebdc81aa31bed54b703c7ee2c3a436c51c90 ---- - src/corelib/global/qnumeric.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h -index 6caf3510f8a..cea5738e524 100644 ---- a/src/corelib/global/qnumeric.h -+++ b/src/corelib/global/qnumeric.h -@@ -25,7 +25,7 @@ - // usable. Its provided functions are in the global namespace even in C++ (not - // std::) because they are sometimes macros. - # include --# if defined(Q_CC_GNU_ONLY) && (defined(Q_STL_LIBCPP) || Q_CC_GNU_ONLY < 1500) -+# if defined(Q_CC_GNU_ONLY) - // broken - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121811 - # elif defined(Q_OS_FREEBSD) && __FreeBSD_version <= 1500000 - // broken - https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290299 diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index aac710d..b2355d6 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -25,7 +25,6 @@ SRC_URI += "\ file://0003-Add-OE-specific-specs-for-clang-compiler.patch \ file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \ file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ - file://0006-qnumeric-disable-use-of-stdckdint.h.patch \ " SRC_URI:append:class-native = "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \