summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-12-20 12:01:21 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-21 21:01:45 +0000
commit6531fa731203debe1b42dedfa225bfa2e1847064 (patch)
tree86c78f54d737f7f49810289d47a561143bcfba0a /recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
parentc8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (diff)
downloadmeta-qt5-6531fa731203debe1b42dedfa225bfa2e1847064.tar.gz
qtbase: use v5.12.0 as base
* restore 0018-Fix-compile-issue-with-gcc-9.patch which is only in v5.12.1 * zlib detection got broken probably in: commit e80bf655e922e9864f8843b5e7bbb47019a6d95a Author: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Date: Thu Dec 7 19:30:07 2017 +0100 configure: verify header presence against sources Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
index 27b354b2..c3f2aed0 100644
--- a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
+++ b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -1,4 +1,4 @@
1From ebd6d61f9031fec80c7dde35819cabec727179aa Mon Sep 17 00:00:00 2001 1From 4a810779f45444d3432ce14bf24d053f5d049ca8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 Aug 2018 00:29:06 +0200 3Date: Tue, 21 Aug 2018 00:29:06 +0200
4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped 4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
15 1 file changed, 11 insertions(+) 15 1 file changed, 11 insertions(+)
16 16
17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
18index b2d81066db..b90e3dc15d 100644 18index 5a5a3a82c6..e5469ff5d7 100644
19--- a/src/corelib/io/qfilesystemengine_unix.cpp 19--- a/src/corelib/io/qfilesystemengine_unix.cpp
20+++ b/src/corelib/io/qfilesystemengine_unix.cpp 20+++ b/src/corelib/io/qfilesystemengine_unix.cpp
21@@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory(); 21@@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory();