sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt5-base: fix patch

Browse Source
This commit is contained in:
Leonid Pliushch 2019-07-19 18:48:29 +03:00 committed by Yaksh Bariya
parent 8a32f7678e
commit 76473aef3a
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11-packages/qt5-base/qt-everywhere-src-5.11.2_qtbase_src_corelib_io_qfilesystemengine_unix.cpp.patch → x11-packages/qt5-base/qt-everywhere-src-5.11.3_qtbase_src_corelib_io_qfilesystemengine_unix.cpp.patch
View File

@ -1,16 +1,16 @@
diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.cpp qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp diff -uNr qt-everywhere-src-5.11.3/qtbase/src/corelib/io/qfilesystemengine_unix.cpp qt-everywhere-src-5.11.3.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
--- qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-09-13 07:25:10.000000000 +0300 --- qt-everywhere-src-5.11.3/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-11-25 14:51:11.000000000 +0200
+++ qt-everywhere-src-5.11.2.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2018-09-21 16:25:01.058662816 +0300 +++ qt-everywhere-src-5.11.3.mod/qtbase/src/corelib/io/qfilesystemengine_unix.cpp 2019-07-19 18:45:35.433356132 +0300
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
# define FICLONE _IOW(0x94, 9, int) #endif
#endif #endif
-# if defined(Q_OS_ANDROID) -#if defined(Q_OS_ANDROID)
+# if defined(Q_OS_ANDROID) || defined (__ANDROID__) +#if defined(Q_OS_ANDROID) || defined(__ANDROID__)
// renameat2() and statx() are disabled on Android because quite a few systems // statx() is disabled on Android because quite a few systems
// come with sandboxes that kill applications that make system calls outside a // 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. // whitelist and several Android vendors can't be bothered to update the list.
@@ -127,7 +127,7 @@ @@ -111,7 +111,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
enum { enum {
@ -19,7 +19,7 @@ diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.
// On Android, the link(2) system call has been observed to always fail // On Android, the link(2) system call has been observed to always fail
// with EACCES, regardless of whether there are permission problems or not. // with EACCES, regardless of whether there are permission problems or not.
SupportsHardlinking = false SupportsHardlinking = false
@@ -722,7 +722,7 @@ @@ -692,7 +692,7 @@
if (entry.isRoot()) if (entry.isRoot())
return entry; return entry;
@ -28,7 +28,7 @@ diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.
// realpath(X,0) is not supported // realpath(X,0) is not supported
Q_UNUSED(data); Q_UNUSED(data);
return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath())); return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
@@ -736,7 +736,7 @@ @@ -706,7 +706,7 @@
errno = savedErrno; errno = savedErrno;
ret = 0; ret = 0;
} }
@ -37,7 +37,7 @@ diff -uNr qt-everywhere-src-5.11.2/qtbase/src/corelib/io/qfilesystemengine_unix.
// On some Android versions, realpath() will return a path even if it does not exist // On some Android versions, realpath() will return a path even if it does not exist
// To work around this, we check existence in advance. // To work around this, we check existence in advance.
if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute)) if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute))
@@ -886,7 +886,7 @@ @@ -856,7 +856,7 @@
#if !defined(Q_OS_INTEGRITY) #if !defined(Q_OS_INTEGRITY)
struct group *gr = 0; struct group *gr = 0;