From 0da5a82700e9de825e72373f29c16e0e5418a63f Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 12 Nov 2025 12:24:57 +0000
Subject: [PATCH 1/2] depends: drop unused qt patch

This hasn't been applied since 5e794e62024eef612e1fbb71c76ea54d17435c14,
but the patch was never removed.
---
 depends/patches/qt/memory_resource.patch | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 depends/patches/qt/memory_resource.patch

diff --git a/depends/patches/qt/memory_resource.patch b/depends/patches/qt/memory_resource.patch
deleted file mode 100644
index 14e25121c00..00000000000
--- a/depends/patches/qt/memory_resource.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix unusable memory_resource on macos
-
-See https://bugreports.qt.io/browse/QTBUG-117484
-and https://bugreports.qt.io/browse/QTBUG-114316
-
---- a/qtbase/src/corelib/tools/qduplicatetracker_p.h
-+++ b/qtbase/src/corelib/tools/qduplicatetracker_p.h
-@@ -52,7 +52,7 @@
- 
- #include <qglobal.h>
- 
--#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
-+#ifdef __cpp_lib_memory_resource
- #  include <unordered_set>
- #  include <memory_resource>
- #else

From 3e9aca6f1b52169eed386849900a400e8cea431e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 12 Nov 2025 12:26:50 +0000
Subject: [PATCH 2/2] depends: drop qtbase-moc-ignore-gcc-macro.patch qt patch

Looks like this was fixed in 6.5 or 6.6, via
https://codereview.qt-project.org/c/qt/qtbase/+/492580.
---
 depends/packages/native_qt.mk                   |  2 --
 depends/packages/qt.mk                          |  2 --
 .../qt/qtbase-moc-ignore-gcc-macro.patch        | 17 -----------------
 3 files changed, 21 deletions(-)
 delete mode 100644 depends/patches/qt/qtbase-moc-ignore-gcc-macro.patch

diff --git a/depends/packages/native_qt.mk b/depends/packages/native_qt.mk
index 38469d6b61e..3428a1ff190 100644
--- a/depends/packages/native_qt.mk
+++ b/depends/packages/native_qt.mk
@@ -6,7 +6,6 @@ $(package)_file_name=$(qt_details_qtbase_file_name)
 $(package)_sha256_hash=$(qt_details_qtbase_sha256_hash)
 $(package)_patches_path := $(qt_details_patches_path)
 $(package)_patches := dont_hardcode_pwd.patch
-$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += qtbase_skip_tools.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += qttools_skip_dependencies.patch
@@ -131,7 +130,6 @@ endef
 
 define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index ad958b7b173..4a564c4afa4 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -11,7 +11,6 @@ $(package)_linux_dependencies := freetype fontconfig libxcb libxkbcommon libxcb_
 $(package)_freebsd_dependencies := $($(package)_linux_dependencies)
 $(package)_patches_path := $(qt_details_patches_path)
 $(package)_patches := dont_hardcode_pwd.patch
-$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += qtbase_avoid_qmain.patch
 $(package)_patches += qtbase_platformsupport.patch
 $(package)_patches += qtbase_plugins_cocoa.patch
@@ -255,7 +254,6 @@ endif
 
 define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_qmain.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_platformsupport.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_plugins_cocoa.patch && \
diff --git a/depends/patches/qt/qtbase-moc-ignore-gcc-macro.patch b/depends/patches/qt/qtbase-moc-ignore-gcc-macro.patch
deleted file mode 100644
index e5e7b126f62..00000000000
--- a/depends/patches/qt/qtbase-moc-ignore-gcc-macro.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The moc executable loops through headers on CPLUS_INCLUDE_PATH and stumbles
-on the GCC internal _GLIBCXX_VISIBILITY macro.  Tell it to ignore it as it is
-not supposed to be looking there to begin with.
-
-Upstream report: https://bugreports.qt.io/browse/QTBUG-83160
-
-diff --git a/qtbase/src/tools/moc/main.cpp b/qtbase/src/tools/moc/main.cpp
---- a/qtbase/src/tools/moc/main.cpp
-+++ b/qtbase/src/tools/moc/main.cpp
-@@ -186,6 +186,7 @@ int runMoc(int argc, char **argv)
-     dummyVariadicFunctionMacro.arguments += Symbol(0, PP_IDENTIFIER, "__VA_ARGS__");
-     pp.macros["__attribute__"] = dummyVariadicFunctionMacro;
-     pp.macros["__declspec"] = dummyVariadicFunctionMacro;
-+    pp.macros["_GLIBCXX_VISIBILITY"] = dummyVariadicFunctionMacro;
- 
-     QString filename;
-     QString output;