diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-11-12 15:15:17 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-11-12 15:15:17 +0000 |
| commit | eb2d5e6688754b424a0fcf431fc70f5334362653 (patch) | |
| tree | 7163f05d16d18c473b33afbe9d7f6e3d63fdf222 /qt5 | |
| parent | 82f91f68c6d29155c302d522339ce060a946b29b (diff) | |
| download | asb-eb2d5e6688754b424a0fcf431fc70f5334362653.tar.gz asb-eb2d5e6688754b424a0fcf431fc70f5334362653.tar.xz | |
qt5: update to 5.13.2
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/build/qt5.SlackBuild | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild index 88e9bfa4..88ce38b6 100755 --- a/qt5/build/qt5.SlackBuild +++ b/qt5/build/qt5.SlackBuild @@ -64,12 +64,13 @@ # Modifications for qt 5.12.3 2019 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.13.0 2019 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.13.1 2019 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.13.2 2019 by Eric Hameleers, Eindhoven, NL cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 -VERSION=${VERSION:-5.13.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.13.2} +BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -158,16 +159,6 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -# Fix keyboard input in webengine: -cd qtbase - cat $CWD/patches/qt5.qtbug-77364.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - -# Fix hardcoded lib/ dir on x86_64: -cd qtbase - cat $CWD/patches/qt5.qtbug-76255.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - # CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui # and for it breaks KWin compilation with: # /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory @@ -177,12 +168,6 @@ cd qtbase | patch -p1 --verbose || exit 1 cd - 1>/dev/null -# Make qtwebengine compile against pulseaudio 13, -cd qtwebengine/src/3rdparty - cat $CWD/patches/qt5.qtbug-77037.patch \ - | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 |