Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (021aac847abc057ba9f3ea43dc12968816f05c79)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (021aac847abc057ba9f3ea43dc12968816f05c79)
  • Date: Sat, 22 Aug 2020 00:23:06 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

qt5/qtbase/HISTORY | 4
+
qt5/qtbase/patches/0001-Disable-O_TMPFILE-conflicts-with-castfs.patch | 25
++++++++++
2 files changed, 29 insertions(+)

New commits:
commit 021aac847abc057ba9f3ea43dc12968816f05c79
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qtbase: Disable O_TMPFILE support

The unnamed temporary file support in the QTemporaryFile class interacts
badly with castfs when materializing the file if the target path doesn't
exist, leading to installation errors with "qmake qinstall".

This is probably because it's trying to materialize the file across
filesystem boundaries, maybe due to a bug in castfs.

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 098247f..15b674b 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2020-08-22 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/0001-Disable-O_TMPFILE-conflicts-with-castfs.patch:
+ Disabled O_TMPFILE support
+
2020-05-28 Ismael Luceno <ismael AT sourcemage.org>
* qtbase: removed, bogus file
* patches/0001-corelib-Fix-memory_resource-feature-check.patch:
diff --git
a/qt5/qtbase/patches/0001-Disable-O_TMPFILE-conflicts-with-castfs.patch
b/qt5/qtbase/patches/0001-Disable-O_TMPFILE-conflicts-with-castfs.patch
new file mode 100644
index 0000000..d7f52ab
--- /dev/null
+++ b/qt5/qtbase/patches/0001-Disable-O_TMPFILE-conflicts-with-castfs.patch
@@ -0,0 +1,25 @@
+From 0bdcb647f8fe187abde0e4b140745f150876ddbb Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Tue, 28 Jul 2020 20:42:37 +0200
+Subject: [PATCH] Disable O_TMPFILE; conflicts with castfs
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/corelib/io/qtemporaryfile_p.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/io/qtemporaryfile_p.h
b/src/corelib/io/qtemporaryfile_p.h
+index 6bcff936b4a9..10971f94f909 100644
+--- a/src/corelib/io/qtemporaryfile_p.h
++++ b/src/corelib/io/qtemporaryfile_p.h
+@@ -64,7 +64,6 @@
+ // some early libc support had the wrong values for O_TMPFILE
+ // (see https://bugzilla.gnome.org/show_bug.cgi?id=769453#c18)
+ # if (O_TMPFILE & O_DIRECTORY) == O_DIRECTORY
+-# define LINUX_UNNAMED_TMPFILE
+ # endif
+ # endif
+ #endif
+--
+2.28.0
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (021aac847abc057ba9f3ea43dc12968816f05c79), Ismael Luceno, 08/21/2020

Archive powered by MHonArc 2.6.24.

Top of Page