qt5-qtbase/qt5-qtbase-glibc.patch

44 lines
1.5 KiB
Diff
Raw Normal View History

2018-09-21 07:43:57 +00:00
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index 13523f07..d3245316 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
2018-07-27 09:40:55 +00:00
@@ -72,7 +72,9 @@
#include <sys/time.h>
#include <sys/shm.h>
#include <sys/socket.h>
+#if 0
#include <sys/stat.h>
+#endif
#include <sys/wait.h>
#include <netinet/in.h>
2018-09-21 07:43:57 +00:00
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index deb4a9f2..d03cf86c 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
2018-07-27 09:40:55 +00:00
@@ -50,7 +50,9 @@
#include <pwd.h>
#include <stdlib.h> // for realpath()
#include <sys/types.h>
+#if 0
#include <sys/stat.h>
+#endif
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
2018-09-21 07:43:57 +00:00
@@ -105,12 +107,12 @@ extern "C" NSString *NSTemporaryDirectory();
2018-07-27 09:40:55 +00:00
# undef SYS_statx
# undef STATX_BASIC_STATS
2018-09-21 07:43:57 +00:00
# else
2018-07-27 09:40:55 +00:00
-# if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
+# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags)
{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
# endif
2018-09-21 07:43:57 +00:00
2018-07-27 09:40:55 +00:00
-# if !QT_CONFIG(statx) && defined(SYS_statx)
+# if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
2018-09-21 07:43:57 +00:00
# include <linux/stat.h>
2018-07-27 09:40:55 +00:00
static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }