From 20b9b822086f02663f1981c0b5047a6f95caf64b Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Wed, 17 Jan 2018 16:15:12 +1100
Subject: [PATCH] upgrel : 5.10-0-4
---
PKGBUILD | 8 ++------
qt-no-statx.patch | 11 -----------
2 files changed, 2 insertions(+), 17 deletions(-)
delete mode 100644 qt-no-statx.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2b2b982..993a34a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_qtver=5.10.0
pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
arch=(x86_64)
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,10 +28,9 @@ 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"
- 'qt-no-statx.patch'
qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch")
sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
- '5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52')
+ '32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7')
validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
prepare() {
@@ -51,9 +50,6 @@ prepare() {
# Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
- # Don't use the statx syscall https://bugs.archlinux.org/task/56289 https://bugreports.qt.io/browse/QTBUG-64490
- patch -p1 -i ../qt-no-statx.patch
-
# https://bugreports.qt.io/browse/QTBUG-65235
patch -p1 -i ../qtbug-65235.patch
}
diff --git a/qt-no-statx.patch b/qt-no-statx.patch
deleted file mode 100644
index 56150f7..0000000
--- a/qt-no-statx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp.orig 2017-11-14 12:10:28.156094557 +0000
-+++ qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp 2017-11-14 12:10:46.156136206 +0000
-@@ -95,7 +95,7 @@
- { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
- # endif
-
--# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
-+# if 0
- # include <linux/stat.h>
- static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
- { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
--
GitLab