From 6b6b8dd7ded5b888ed88a0b1954c0173223c680a Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 23 Jun 2018 22:04:37 +0200 Subject: Updates to Qt5 and Plasma Bugfix releases: Qt5 updated to 5.11.1 and Plasma updated to 5.13.1. --- deps/qt5/.url | 2 +- deps/qt5/qt5.SlackBuild | 10 +++++----- kde/build/plasma-browser-integration | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 kde/build/plasma-browser-integration diff --git a/deps/qt5/.url b/deps/qt5/.url index 27dee07..a133eca 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.11/5.11.0/single/qt-everywhere-src-5.11.0.tar.xz +http://download.qt.io/official_releases/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 4915996..3348695 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -59,7 +59,7 @@ # Modifications for qt 5.11.0 2018 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.11.0} +VERSION=${VERSION:-5.11.1} BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -150,10 +150,10 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -# Fix missing private includes: QTBUG-37417 -cd qtbase - cat $CWD/patches/qt5.private-includes.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null +## Fix missing private includes: QTBUG-37417 +#cd qtbase +# cat $CWD/patches/qt5.private-includes.patch | patch -p1 --verbose || exit 1 +#cd - 1>/dev/null if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: diff --git a/kde/build/plasma-browser-integration b/kde/build/plasma-browser-integration deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/plasma-browser-integration +++ /dev/null @@ -1 +0,0 @@ -2 -- cgit v1.2.3