From a733c671ae2cd0d41fb6542bf78be4ff1dbe2df2 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 1 Nov 2016 22:34:06 +0100 Subject: deps: updated for KDE 5_16.08 --- deps/qt5/qt5.SlackBuild | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'deps/qt5/qt5.SlackBuild') diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index e7df254..0b5c52f 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -47,12 +47,13 @@ # Modifications for qt 5.5.1 2015,2016 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.6.0 2016 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.6.1 2016 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.7.0 2016 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.6.1-1} +VERSION=${VERSION:-5.7.0} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} @@ -134,25 +135,20 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -## Properly detect ALSA version 1.1.0 as being newer than 1.0.10: -#cat $CWD/patches/qt5.alsa.patch | patch -p1 --verbose || exit 1 -# -## Build with explicitlib, preventing linker errors: -#cd qtbase -# cat $CWD/patches/qt5.qtbug-51621.patch | patch -p1 --verbose || exit 1 -#cd - -# -## Backport fixes for QtDBus deadlocks: -#cd qtbase -# cat $CWD/patches/qt5.qtbug-51648.patch | patch -p1 --verbose || exit 1 -# cat $CWD/patches/qt5.qtbug-51649.patch | patch -p1 --verbose || exit 1 -# cat $CWD/patches/qt5.qtbug-51676.patch | patch -p1 --verbose || exit 1 -#cd - -# -## qtwebengine fails to build with system nss 3.23: -#cd qtwebengine -# cat $CWD/patches/qt5.qtbug-51890.patch | patch -p1 --verbose || exit 1 -#cd - +# Fix UNSIGNED values in QMYSQL: +cd qtbase + cat $CWD/patches/qt5.qtbug-53237.patch | patch -p1 --verbose || exit 1 +cd - + +# Fix freetype engine performance: +cd qtbase + cat $CWD/patches/qt5.qtbug-49452.patch | patch -p1 --verbose || exit 1 +cd - + +# Don't depend on features that were only added in linux 4.5: +cd qtwebengine + cat $CWD/patches/qt5.glibc224.patch | patch -p1 --verbose || exit 1 +cd - if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: @@ -197,6 +193,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -dbus \ -glib \ -icu \ + -opengl \ -openssl \ -optimized-qmake \ -qpa xcb \ -- cgit v1.2.3