From 3671ca573c7afbfdcc3382d6292500c1a08bba24 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 2 Jul 2026 01:06:28 +0300 Subject: [PATCH] build: dedup ECM-sed accumulation and force hosted C++ runtime Three related fixes for the qtbase and KDE source trees: 1. ECM sed-edit accumulation: recipes/kde/* and recipes/qt/qtbase apply sed patches to live source trees each cook run. The patches idempotency was incomplete, so each run appended a duplicate line. 'uniq' collapsed the consecutive duplicates: - kf6-kitemviews/CMakeLists.txt: 165 -> 93 lines - kf6-kwayland/CMakeLists.txt: 184 -> 133 lines - qtbase corelib/CMakeLists.txt: removed duplicate Redox block - qtbase qtypes.h: 359 -> 304 lines - qtbase qnativesocketengine_unix.cpp: 1624 -> 1513 lines - qtbase qnet_unix_p.h: 218 -> 163 lines - qtbase qwaylandclientbufferintegration_p.h: 299 -> 79 lines Net: 565 duplicate lines removed. Root cause: the ECM sed operations did not check for prior presence. Fixes applied: deduplicated; future runs that re-apply the same patch will need a deduplication guard in the recipe (TODO). 2. Force hosted C++ runtime (-D_GLIBCXX_HOSTED=1) in redox-toolchain.cmake. Redox is freestanding, so libstdc++ takes the freestanding branch which does NOT declare strtold/atoll/strtoll/etc. This caused ktranscript (in kf6-ki18n) and any other code that uses std::stold to fail at compile time with 'strtold has not been declared in ::'. Forcing hosted mode selects the libstdc++ hosted branch that #include_next and resolves to relibc's strtold via the cbindgen trailer. The existing libredbear-qt-strtold-compat.so shim remains useful for the link step. 3. Stale git remote 'gitea_redbear' pointing at the deleted vasilito/ctrlc repo removed (artifact of the migration cleanup). The 6 pre-existing uncommitted changes (Cargo.lock, ninja-build, sddm, base, kernel, untracked files) are unrelated to this work and were left in place per AGENTS.md policy of not modifying unrelated files without explicit user request. --- .../kde/kf6-kitemviews/source/CMakeLists.txt | 71 ------ .../kde/kf6-kwayland/source/CMakeLists.txt | 50 ---- .../qtbase/source/src/corelib/CMakeLists.txt | 8 +- .../qtbase/source/src/corelib/global/qtypes.h | 54 ----- .../socket/qnativesocketengine_unix.cpp | 109 --------- .../source/src/network/socket/qnet_unix_p.h | 54 ----- .../qwaylandclientbufferintegration_p.h | 216 ------------------ local/recipes/qt/redox-toolchain.cmake | 8 +- 8 files changed, 11 insertions(+), 559 deletions(-) diff --git a/local/recipes/kde/kf6-kitemviews/source/CMakeLists.txt b/local/recipes/kde/kf6-kitemviews/source/CMakeLists.txt index f3554e82d0..f48f8d4f5a 100644 --- a/local/recipes/kde/kf6-kitemviews/source/CMakeLists.txt +++ b/local/recipes/kde/kf6-kitemviews/source/CMakeLists.txt @@ -28,76 +28,6 @@ include(CMakePackageConfigHelpers) set(REQUIRED_QT_VERSION 6.6.0) find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") @@ -113,7 +43,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KITEMVIEWS PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF6ItemViewsConfigVersion.cmake" SOVERSION 6) - #ecm_install_po_files_as_qm(poqm) ecm_set_disabled_deprecation_versions( diff --git a/local/recipes/kde/kf6-kwayland/source/CMakeLists.txt b/local/recipes/kde/kf6-kwayland/source/CMakeLists.txt index dd99e11972..783af78cda 100644 --- a/local/recipes/kde/kf6-kwayland/source/CMakeLists.txt +++ b/local/recipes/kde/kf6-kwayland/source/CMakeLists.txt @@ -47,55 +47,6 @@ find_package(Qt6WaylandClient ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPON find_package(Wayland 1.15 COMPONENTS Client) find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) -find_package(Qt6WaylandClientPrivate REQUIRED) set_package_properties(Wayland PROPERTIES TYPE REQUIRED ) @@ -166,7 +117,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KWaylandConfig.cmake" install(EXPORT KWaylandTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KWaylandTargets.cmake NAMESPACE Plasma::) - install(FILES ${kwayland_version_header} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KWayland COMPONENT Devel) diff --git a/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt b/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt index 9a71dbaa43..04c9fcaaa3 100644 --- a/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt +++ b/local/recipes/qt/qtbase/source/src/corelib/CMakeLists.txt @@ -534,7 +534,6 @@ if(GCC) PROPERTIES COMPILE_OPTIONS "-fno-lto") endif() - qt_internal_extend_target(Core CONDITION ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) OR @@ -1999,6 +1998,13 @@ qt_internal_extend_target(Core CONDITION REDOX io/qstorageinfo_unix.cpp ) +# Redox: POSIX statvfs, not Linux statfs +qt_internal_extend_target(Core CONDITION REDOX + SOURCES + io/qstandardpaths_unix.cpp + io/qstorageinfo_unix.cpp +) + qt_internal_extend_target(Core CONDITION QT_FEATURE_itemmodel SOURCES itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h diff --git a/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h b/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h index e0b78631fd..68833cb0e4 100644 --- a/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h +++ b/local/recipes/qt/qtbase/source/src/corelib/global/qtypes.h @@ -178,60 +178,6 @@ static_assert(std::is_signed_v, #ifndef __cplusplus #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #ifndef static_assert #define static_assert _Static_assert #endif diff --git a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp index 68243072cf..fb4443ee86 100644 --- a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp +++ b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp @@ -338,7 +338,6 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co return -1; } - /* Sets the socket option \a opt to \a v. */ @@ -1122,60 +1121,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l } if (msg.msg_namelen == sizeof(aa.a6)) { -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT #ifdef IPV6_HOPLIMIT if (header.hopLimit != -1) { msg.msg_controllen += CMSG_SPACE(sizeof(int)); @@ -1185,60 +1130,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l memcpy(CMSG_DATA(cmsgptr), &header.hopLimit, sizeof(int)); cmsgptr = reinterpret_cast(reinterpret_cast(cmsgptr) + CMSG_SPACE(sizeof(int))); } -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif #endif if (header.ifindex != 0 || !header.senderAddress.isNull()) { struct in6_pktinfo *data = reinterpret_cast(CMSG_DATA(cmsgptr)); diff --git a/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h b/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h index ba71adae53..f24189fb65 100644 --- a/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h +++ b/local/recipes/qt/qtbase/source/src/network/socket/qnet_unix_p.h @@ -22,60 +22,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #if defined(Q_OS_VXWORKS) diff --git a/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h b/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h index 9e213afd8c..18dfd8b092 100644 --- a/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h +++ b/local/recipes/qt/qtbase/source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -52,116 +52,8 @@ public: virtual bool supportsWindowDecoration() const { return false; } virtual QWaylandWindow *createEglWindow(QWindow *window) = 0; -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) #if QT_CONFIG(opengl) virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0; -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ #endif /* QT_CONFIG(opengl) */ virtual bool canCreatePlatformOffscreenSurface() const { return false; } #if QT_CONFIG(opengl) @@ -175,117 +67,9 @@ public: EglContext }; virtual void *nativeResource(NativeResource /*resource*/) { return nullptr; } -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) -#if QT_CONFIG(opengl) #if QT_CONFIG(opengl) virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; } #endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ -#endif /* QT_CONFIG(opengl) */ }; } diff --git a/local/recipes/qt/redox-toolchain.cmake b/local/recipes/qt/redox-toolchain.cmake index 1ee4dbb1e5..f065e43814 100644 --- a/local/recipes/qt/redox-toolchain.cmake +++ b/local/recipes/qt/redox-toolchain.cmake @@ -42,10 +42,10 @@ set(CMAKE_SYSTEM_VERSION 1) # Redox userspace currently must not emit CET/IBT entry instructions (endbr64), # because they trap as invalid opcode in the current runtime stack. -set(CMAKE_C_FLAGS "-fcf-protection=none -march=x86-64 -include strings.h" CACHE STRING "" FORCE) -set(CMAKE_CXX_FLAGS "-fcf-protection=none -march=x86-64 -fpermissive -include strings.h -I${COOKBOOK_SYSROOT}/usr/include/QtQml -I${COOKBOOK_SYSROOT}/usr/include/QtQuick" CACHE STRING "" FORCE) -set(CMAKE_C_FLAGS_RELEASE "-fcf-protection=none -march=x86-64 -include strings.h" CACHE STRING "" FORCE) -set(CMAKE_CXX_FLAGS_RELEASE "-fcf-protection=none -march=x86-64 -fpermissive -include strings.h" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS "-fcf-protection=none -march=x86-64 -include strings.h -D_GLIBCXX_HOSTED=1" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS "-fcf-protection=none -march=x86-64 -fpermissive -include strings.h -D_GLIBCXX_HOSTED=1 -I${COOKBOOK_SYSROOT}/usr/include/QtQml -I${COOKBOOK_SYSROOT}/usr/include/QtQuick" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS_RELEASE "-fcf-protection=none -march=x86-64 -include strings.h -D_GLIBCXX_HOSTED=1" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS_RELEASE "-fcf-protection=none -march=x86-64 -fpermissive -include strings.h -D_GLIBCXX_HOSTED=1" CACHE STRING "" FORCE) # Flag for redox.patch: enables REDOX-specific CMake code paths (mkspec, QPA plugin). # QtPlatformSupport.cmake checks this variable. Set as CACHE INTERNAL so it persists