Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 qt5/qtbase/HISTORY                                                           
      |    4 
 
qt5/qtbase/patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
 |   40 +++++++
 qt5/qtbase/patches/qt5-qtbase-glibc.patch                                    
      |   53 ----------
 3 files changed, 44 insertions(+), 53 deletions(-)

New commits:
commit 11f46ac682efcae3765e1e8c002170869f4b6ee7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    qtbase: Replace broken patch for glibc

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 29aa33f..c7f11f8 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2018-09-10 Ismael Luceno <ismael AT iodev.co.uk>
+       * patches/qt5-qtbase-glibc.patch, 
patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch:
+         replace the glibc patch with a better version that doesn't break 
other builds
+
 2018-09-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: optional ccache, improves build performance
 
diff --git 
a/qt5/qtbase/patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
 
b/qt5/qtbase/patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
new file mode 100644
index 0000000..4241d83
--- /dev/null
+++ 
b/qt5/qtbase/patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -0,0 +1,40 @@
+From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony AT gmail.com>
+Date: Tue, 21 Aug 2018 00:29:06 +0200
+Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
+ build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony AT gmail.com>
+---
+ src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp 
b/src/corelib/io/qfilesystemengine_unix.cpp
+index be6ce48d0cb..1bf1bebc7f1 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory();
+ #  define FICLONE       _IOW(0x94, 9, int)
+ #endif
+
++// renameat2/statx features for non bootstrapped build
++#ifndef QT_BOOTSTRAPPED
++#ifdef __GLIBC_PREREQ
++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
++#else
++# define QT_FEATURE_renameat2 -1
++# define QT_FEATURE_statx -1
++#endif
++#endif
++
+ #  if defined(Q_OS_ANDROID)
+ // renameat2() and statx() are disabled on Android because quite a few 
systems
+ // come with sandboxes that kill applications that make system calls 
outside a
+--
+2.14.4
diff --git a/qt5/qtbase/patches/qt5-qtbase-glibc.patch 
b/qt5/qtbase/patches/qt5-qtbase-glibc.patch
deleted file mode 100644
index 022b698..0000000
--- a/qt5/qtbase/patches/qt5-qtbase-glibc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up 
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc 
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h
---- qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc     
  2018-06-15 09:29:31.000000000 +0200
-+++ qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h     
2018-07-26 15:40:56.887961897 +0200
-@@ -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>
- 
-diff -up 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp
---- 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc  
     2018-06-15 09:29:31.000000000 +0200
-+++ qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp   
  2018-07-26 16:34:54.346840184 +0200
-@@ -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>
-@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
- #  include <sys/syscall.h>
- #  include <sys/sendfile.h>
- #  include <linux/fs.h>
-+#if 0
- #  include <linux/stat.h>
-+#endif
- 
- // in case linux/fs.h is too old and doesn't define it:
- #ifndef FICLONE
-@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirector
- #    undef SYS_renameat2
- #    undef SYS_statx
- #    undef STATX_BASIC_STATS
--#  else
--#    if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
-+#  else 
-+#    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
- 
--#    if !QT_CONFIG(statx) && defined(SYS_statx)
-+#    if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
- static int statx(int dirfd, const char *pathname, int flag, unsigned mask, 
struct statx *statxbuf)
- { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
- #    elif !QT_CONFIG(statx) && !defined(SYS_statx)