depends: native_qt: remove unneeded patches

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index ec7c0772492a0b69d8dd775098bb38260bb74d98..7fa1914655c39180c706ec85cacabc1105782700 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -12,8 +12,6 @@ $(package)_patches += fast_fixed_dtoa_no_optimize.patch
 $(package)_patches += guix_cross_lib_path.patch
 $(package)_patches += mac-qmake.conf
 $(package)_patches += no_pthread_cond_clockwait.patch
-$(package)_patches += no-renameat2.patch
-$(package)_patches += no-statx.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
@@ -168,8 +166,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \
   patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
-  patch -p1 -i $($(package)_patch_dir)/no-statx.patch && \
-  patch -p1 -i $($(package)_patch_dir)/no-renameat2.patch && \
   patch -p1 -i $($(package)_patch_dir)/no_pthread_cond_clockwait.patch
 endef
 

diff --git a/contrib/depends/patches/native_qt/no-renameat2.patch b/contrib/depends/patches/native_qt/no-renameat2.patch
deleted file mode 100644 (file)
index d93dd0e..0000000
--- a/contrib/depends/patches/native_qt/no-renameat2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 92ba295ee64a55c73c8a32b77c352a6181289fe8 Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sun, 30 Oct 2022 23:15:34 +0100
-Subject: [PATCH] no renameat2
-
----
- qtbase/src/corelib/configure.cmake               | 2 --
- qtbase/src/corelib/global/qconfig-bootstrapped.h | 4 ----
- 2 files changed, 6 deletions(-)
-
-diff --git a/qtbase/src/corelib/configure.cmake b/qtbase/src/corelib/configure.cmake
-index 183decb530..f8e9ad0e87 100644
---- a/qtbase/src/corelib/configure.cmake
-+++ b/qtbase/src/corelib/configure.cmake
-@@ -434,8 +434,6 @@ qt_config_compile_test(renameat2
-     LABEL "renameat2()"
-     CODE
- "#define _ATFILE_SOURCE 1
--#include <fcntl.h>
--#include <stdio.h>
- 
- int main(int, char **argv)
- {
-diff --git a/qtbase/src/corelib/global/qconfig-bootstrapped.h b/qtbase/src/corelib/global/qconfig-bootstrapped.h
-index 61fd6479b1..06d06235d5 100644
---- a/qtbase/src/corelib/global/qconfig-bootstrapped.h
-+++ b/qtbase/src/corelib/global/qconfig-bootstrapped.h
-@@ -74,11 +74,7 @@
- #define QT_NO_QOBJECT
- #define QT_FEATURE_process -1
- #define QT_FEATURE_regularexpression 1
--#ifdef __GLIBC_PREREQ
--# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
--#else
- # define QT_FEATURE_renameat2 -1
--#endif
- #define QT_FEATURE_shortcut -1
- #define QT_FEATURE_signaling_nan -1
- #define QT_FEATURE_slog2 -1
--- 
-2.38.1
-

diff --git a/contrib/depends/patches/native_qt/no-statx.patch b/contrib/depends/patches/native_qt/no-statx.patch
deleted file mode 100644 (file)
index d4c88ae..0000000
--- a/contrib/depends/patches/native_qt/no-statx.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ceb48fa2f01b9c421d880f6220778d830e5c5f7b Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sun, 30 Oct 2022 16:52:17 +0100
-Subject: [PATCH] Never use statx
-
----
- src/corelib/configure.cmake               | 1 -
- src/corelib/global/qconfig-bootstrapped.h | 6 +-----
- src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
- 3 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/qtbase/src/corelib/configure.cmake b/qtbase/src/corelib/configure.cmake
-index 4ab122afd0..7b89fa3dd7 100644
---- a/qtbase/src/corelib/configure.cmake
-+++ b/qtbase/src/corelib/configure.cmake
-@@ -428,7 +428,6 @@ qt_config_compile_test(statx
-     CODE
- "#define _ATFILE_SOURCE 1
- #include <sys/types.h>
--#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- 
-diff --git a/qtbase/src/corelib/global/qconfig-bootstrapped.h b/qtbase/src/corelib/global/qconfig-bootstrapped.h
-index 42d38d0d04..25b551210c 100644
---- a/qtbase/src/corelib/global/qconfig-bootstrapped.h
-+++ b/qtbase/src/corelib/global/qconfig-bootstrapped.h
-@@ -119,11 +119,7 @@
- #define QT_FEATURE_shortcut -1
- #define QT_FEATURE_signaling_nan -1
- #define QT_FEATURE_slog2 -1
--#ifdef __GLIBC_PREREQ
--# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
--#else
--# define QT_FEATURE_statx -1
--#endif
-+#define QT_FEATURE_statx -1
- #define QT_FEATURE_syslog -1
- #define QT_NO_SYSTEMLOCALE
- #define QT_FEATURE_systemsemaphore -1
-diff --git a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
-index 5ba9309426..c968d1c61f 100644
---- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
-+++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -99,7 +99,7 @@ extern "C" NSString *NSTemporaryDirectory();
- #endif
- #endif
- 
--#if defined(Q_OS_ANDROID)
-+#if defined(Q_OS_LINUX)
- // statx() is disabled on Android because quite a few systems
- // come with sandboxes that kill applications that make system calls outside a
- // whitelist and several Android vendors can't be bothered to update the list.
--- 
-2.38.1
-