summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-06-23 22:04:37 +0200
committer Eric Hameleers <alien@slackware.com>2018-06-23 22:04:37 +0200
commit6b6b8dd7ded5b888ed88a0b1954c0173223c680a (patch)
tree925224f73391077ce1267932dd388917b60e71ce
parent53eb7eed4ba066b2fac305fbb17d7c9416be3f5b (diff)
downloadktown-6b6b8dd7ded5b888ed88a0b1954c0173223c680a.tar.gz
ktown-6b6b8dd7ded5b888ed88a0b1954c0173223c680a.tar.xz
Updates to Qt5 and Plasma
Bugfix releases: Qt5 updated to 5.11.1 and Plasma updated to 5.13.1.
-rw-r--r--deps/qt5/.url2
-rwxr-xr-xdeps/qt5/qt5.SlackBuild10
-rw-r--r--kde/build/plasma-browser-integration1
3 files changed, 6 insertions, 7 deletions
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