Date: Thursday, March 1, 2018 @ 20:52:55 Author: arojas Revision: 317734
Fix build, drop obsolete patch Modified: qt5-doc/kde-unstable/PKGBUILD Deleted: qt5-doc/kde-unstable/qt-no-statx.patch -------------------+ PKGBUILD | 16 +++++++--------- qt-no-statx.patch | 11 ----------- 2 files changed, 7 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-01 17:13:39 UTC (rev 317733) +++ PKGBUILD 2018-03-01 20:52:55 UTC (rev 317734) @@ -12,16 +12,18 @@ 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/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz" - qt-no-statx.patch) -sha256sums=('4884a2a122da603343f5066147be7be32a9cadc7daa017980bf47731d15699b5' - '5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52') +source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz") +sha256sums=('4884a2a122da603343f5066147be7be32a9cadc7daa017980bf47731d15699b5') prepare() { cd ${_pkgfqn} + cd qtbase + bin/syncqt.pl -version ${_qtver%-*} + cd .. ln -s /usr/bin qttools/ ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/ @@ -30,10 +32,6 @@ 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() { Deleted: qt-no-statx.patch =================================================================== --- qt-no-statx.patch 2018-03-01 17:13:39 UTC (rev 317733) +++ qt-no-statx.patch 2018-03-01 20:52:55 UTC (rev 317734) @@ -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); }