diff options
author | Eric Hameleers <alien@slackware.com> | 2018-10-24 14:02:03 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-10-24 14:02:03 +0200 |
commit | f8c0c8d872fd4d0b8920ecabf107a99044813099 (patch) | |
tree | de6909691de61d65ea830730d53018560892ae12 /deps/qt5 | |
parent | 1c8065c7b7a544bc02a6eced8087de1ac1bd069f (diff) | |
download | ktown-f8c0c8d872fd4d0b8920ecabf107a99044813099.tar.gz ktown-f8c0c8d872fd4d0b8920ecabf107a99044813099.tar.xz |
Updates to the dependencies for upcoming Plasma5 release
The update of icu4c in -current required that several packages had to be
recompiled or upgraded to get them to work again.
Unfortunately the update of icu4c in -current co-incided with my release
of KDE 5_18.10 and these deps had to be fixed post-release.
Some issues emerged as a result of these updates:
- SIP now stores private copies of sip.so in PyQt5 subdirectories,
and the hp-systray in the hplip package fails to start as a result
- In the new QScintilla packages, I was unable to compile the
Python2 bindings for PyQt4.
Diffstat (limited to 'deps/qt5')
-rwxr-xr-x | deps/qt5/qt5.SlackBuild | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 2f581a4..0eee250 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -64,7 +64,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=${VERSION:-5.11.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -178,7 +178,7 @@ sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \ sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \ -i qtbase/mkspecs/common/g++-unix.conf || exit 1 -# Enable h.264 codec support: +# Enable h.264 codec support (no longer works with Qt 5.11)): echo "WEBENGINE_CONFIG += use_proprietary_codecs" >> qtwebengine/.qmake.conf # Enable all languages in the virtual keyboard (required by Plasma 5.11): @@ -202,6 +202,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \ -docdir /usr/doc/qt5-$PKGVER \ -examplesdir /usr/doc/qt5-$PKGVER/examples \ + -proprietary-codecs \ -system-libpng \ -system-libjpeg \ -system-sqlite \ @@ -214,7 +215,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -glib \ -icu \ -opengl \ - -openssl \ + -openssl-linked \ -optimized-qmake \ -qpa xcb \ -qt-harfbuzz \ |