mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-31 10:41:08 +00:00
Merge bitcoin/bitcoin#33860: depends: drop Qt patches
3e9aca6f1b52169eed386849900a400e8cea431e depends: drop qtbase-moc-ignore-gcc-macro.patch qt patch (fanquake)
0da5a82700e9de825e72373f29c16e0e5418a63f depends: drop unused qt patch (fanquake)
Pull request description:
Drop one patch that was already unused, and one that compilation succeeds without.
ACKs for top commit:
TheCharlatan:
ACK 3e9aca6f1b52169eed386849900a400e8cea431e
Tree-SHA512: 4416348c80d8af8530d46d4f5a02a1170f7a4e2fc8ef88cffb8888fa913ed86d1bef10efb437434ebcdac1b1ed23a3669c1ba654cf6f4395dc0a73192fe0024f
This commit is contained in:
commit
e221b25246
@ -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
|
||||
|
||||
@ -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 && \
|
||||
|
||||
@ -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
|
||||
@ -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;
|
||||
Loading…
x
Reference in New Issue
Block a user