[arch-commits] Commit in qt5-base/trunk (PKGBUILD glibc-2.28.patch)

2018-09-09 Thread Antonio Rojas via arch-commits 
Date: Sunday, September 9, 2018 @ 17:03:08
  Author: arojas
Revision: 334292

double-conversion 3.1.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD
Deleted:
  qt5-base/trunk/glibc-2.28.patch

--+
 PKGBUILD |   10 +-
 glibc-2.28.patch |   53 -
 2 files changed, 5 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-09 16:46:26 UTC (rev 334291)
+++ PKGBUILD2018-09-09 17:03:08 UTC (rev 334292)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.11.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,15 +27,15 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";
-glibc-2.28.patch)
+
qt5-base-glibc-2.28.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch?id=25feee4e";)
 sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
-'46fe59014d32862334b3f8bb81e02e84edc57bd5c465cde98cd9a05ccc343b9a')
+'2e594aadc8fe30267a02b8561d76d06198de418aaf606cd7e16a2ee62009bfec')
 
 prepare() {
   cd ${_pkgfqn}
 
-  # Work around build failure with glibc 2.28 (patch from Fedora)
-  patch -Np1 -i ../glibc-2.28.patch
+  # Fix build failure with glibc 2.28
+  patch -p1 -i ../qt5-base-glibc-2.28.patch
 
   # Build qmake using Arch {C,LD}FLAGS
   # This also sets default {C,CXX,LD}FLAGS for projects built using qmake

Deleted: glibc-2.28.patch
===
--- glibc-2.28.patch2018-09-09 16:46:26 UTC (rev 334291)
+++ glibc-2.28.patch2018-09-09 17:03:08 UTC (rev 334292)
@@ -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.0 +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 
- #include 
- #include 
-+#if 0
- #include 
-+#endif
- #include 
- #include 
- 
-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.0 +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 
- #include  // for realpath()
- #include 
-+#if 0
- #include 
-+#endif
- #include 
- #include 
- #include 
-@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
- #  include 
- #  include 
- #  include 
-+#if 0
- #  include 
-+#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)

[arch-commits] Commit in qt5-base/trunk (PKGBUILD glibc-2.28.patch)

2018-08-06 Thread Evangelos Foutras via arch-commits 
Date: Monday, August 6, 2018 @ 18:05:16
  Author: foutrelis
Revision: 331025

Work around build failure with glibc 2.28

Added:
  qt5-base/trunk/glibc-2.28.patch
Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 glibc-2.28.patch |   53 +
 2 files changed, 60 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 17:52:26 UTC (rev 331024)
+++ PKGBUILD2018-08-06 18:05:16 UTC (rev 331025)
@@ -26,12 +26,17 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";)
-sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";
+glibc-2.28.patch)
+sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
+'46fe59014d32862334b3f8bb81e02e84edc57bd5c465cde98cd9a05ccc343b9a')
 
 prepare() {
   cd ${_pkgfqn}
 
+  # Work around build failure with glibc 2.28 (patch from Fedora)
+  patch -Np1 -i ../glibc-2.28.patch
+
   # Build qmake using Arch {C,LD}FLAGS
   # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
   sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \

Added: glibc-2.28.patch
===
--- glibc-2.28.patch(rev 0)
+++ glibc-2.28.patch2018-08-06 18:05:16 UTC (rev 331025)
@@ -0,0 +1,53 @@
+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.0 +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 
+ #include 
+ #include 
++#if 0
+ #include 
++#endif
+ #include 
+ #include 
+ 
+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.0 +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 
+ #include  // for realpath()
+ #include 
++#if 0
+ #include 
++#endif
+ #include 
+ #include 
+ #include 
+@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
+ #  include 
+ #  include 
+ #  include 
++#if 0
+ #  include 
++#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)