From b41709802f3fa20d9a841176a6cb46f03c5b8f5c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 7 Mar 2017 23:31:44 +0100 Subject: [PATCH] qt5: have QFileSystemEngine::createDirectory() handle EROFS. --- dev-qt/qt5/patches/qt5-5.8.0.patchset | 25 +++++++++++++++++++++++++ dev-qt/qt5/qt5-5.8.0.recipe | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt5/patches/qt5-5.8.0.patchset b/dev-qt/qt5/patches/qt5-5.8.0.patchset index 8359c41c9..aa12eb502 100644 --- a/dev-qt/qt5/patches/qt5-5.8.0.patchset +++ b/dev-qt/qt5/patches/qt5-5.8.0.patchset @@ -5293,3 +5293,28 @@ index 0b9235a..bfc2a0c 100644 -- 2.10.2 + +From ec1a9d55080a646c4b70d48baad80355c7737b47 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 7 Mar 2017 22:11:02 +0100 +Subject: createDirectory should handle EROFS on Haiku. + + +diff --git a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp +index 1b908ea..92249d3 100644 +--- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp +@@ -579,6 +579,10 @@ bool QFileSystemEngine::createDirectory(const QFileSystemEntry &entry, bool crea + // on the QNet mountpoint returns successfully and reports S_IFDIR. + || errno == ENOENT + #endif ++#if defined(Q_OS_HAIKU) ++ // On Haiku some shine-through directories (ie "non-packaged") returns EROFS. ++ || errno == EROFS ++#endif + ) { + QT_STATBUF st; + if (QT_STAT(chunk.constData(), &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) +-- +2.10.2 + diff --git a/dev-qt/qt5/qt5-5.8.0.recipe b/dev-qt/qt5/qt5-5.8.0.recipe index 7aa812d5a..5483cd2b6 100644 --- a/dev-qt/qt5/qt5-5.8.0.recipe +++ b/dev-qt/qt5/qt5-5.8.0.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/" COPYRIGHT="2015-2017 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.qt.io/official_releases/qt/5.8/$portVersion/single/qt-everywhere-opensource-src-$portVersion.tar.xz" SOURCE_URI_2="https://download.qt.io/community_releases/5.8/$portVersion-final/qtwebkit-opensource-src-$portVersion.tar.xz" CHECKSUM_SHA256="0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6"