git » qt5-doc.git » commit a912f5e

Qt 5.11.0

author Antonio Rojas
2018-05-22 08:34:59 UTC
committer Antonio Rojas
2018-05-22 08:34:59 UTC
parent f20c8480e75603442d421267a7339551f8ee3cff

Qt 5.11.0

PKGBUILD +5 -10
qt-no-statx.patch +0 -11

diff --git a/PKGBUILD b/PKGBUILD
index 1984921..29947f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Michael Hansen <zrax0111 gmail com>
 
 pkgname=qt5-doc
-_qtver=5.10.1
+_qtver=5.11.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=('any')
@@ -12,13 +12,12 @@ url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework (Documentation)'
 depends=('qt5-base')
-makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite' 'gperf' 'nss')
+makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite'
+             'gperf' 'nss' 'clang')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz"
-        qt-no-statx.patch)
-sha256sums=('05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a'
-            '5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz")
+sha256sums=('67ddb8bf33bbfd19ebc641467ccce2e57fd0b80c6082457f1f5a76e8df83c865')
 
 prepare() {
   cd ${_pkgfqn}
@@ -30,10 +29,6 @@ prepare() {
   cd "$srcdir"
   mkdir -p bin
   ln -s /usr/bin/python2 bin/python
-
-  # Don't use the statx syscall https://bugs.archlinux.org/task/56289 https://bugreports.qt.io/browse/QTBUG-64490
-  cd ${_pkgfqn}/qtbase
-  patch -p1 -i "$srcdir"/qt-no-statx.patch
 }
 
 build() {
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); }