From d2c1299abd39a72106d7d635ac657324d4976271 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 10 Aug 2018 15:25:06 +0200 Subject: Update the deps for KDE 5_18.07 Most prominent is the upgrade of Qt to 5.11.1 --- deps/qt5/.url | 2 +- deps/qt5/patches/qt5.private-includes.patch | 53 +++++++++++++++++++++++++++++ deps/qt5/qt5.SlackBuild | 32 ++++++++--------- 3 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 deps/qt5/patches/qt5.private-includes.patch (limited to 'deps/qt5') diff --git a/deps/qt5/.url b/deps/qt5/.url index 5018bbc..a133eca 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.9/5.9.6/single/qt-everywhere-opensource-src-5.9.6.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/patches/qt5.private-includes.patch b/deps/qt5/patches/qt5.private-includes.patch new file mode 100644 index 0000000..3ef8ebe --- /dev/null +++ b/deps/qt5/patches/qt5.private-includes.patch @@ -0,0 +1,53 @@ +# Taken from http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d +# ------------------------------------------------------------------ + +From 67aa365d41ebfe082b4efcfd725e4d5f08be678c Mon Sep 17 00:00:00 2001 +From: Ulf Hermann +Date: Wed, 25 Apr 2018 12:48:21 +0200 +Subject: Do emit CMake declarations for existing private headers + +We need to make sure we don't emit CMake declarations for private +headers if those headers are absent. However, most of the time we have +private headers and should add them. + +Task-number: QTBUG-37417 +Change-Id: I639eb93d008de27928dedac540894af70c1883b9 +Reviewed-by: Oswald Buddenhagen +--- + mkspecs/features/create_cmake.prf | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 66acedef55..2ed708e085 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -28,9 +28,13 @@ CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake + + CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) + ++!generated_privates { ++ isEmpty(SYNCQT.INJECTED_PRIVATE_HEADER_FILES):isEmpty(SYNCQT.PRIVATE_HEADER_FILES): \ ++ CMAKE_NO_PRIVATE_INCLUDES = true ++} ++ + split_incpath { + CMAKE_ADD_SOURCE_INCLUDE_DIRS = true +- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist + CMAKE_SOURCE_INCLUDES = \ + $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}) + CMAKE_SOURCE_PRIVATE_INCLUDES = \ +@@ -53,10 +57,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { + CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + } + +-isEmpty(QT.$${MODULE}_private.includes)| \ +- !exists($$first(QT.$${MODULE}_private.includes)): \ +- CMAKE_NO_PRIVATE_INCLUDES = true +- + CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) + contains(CMAKE_LIB_DIR,"^\\.\\./.*") { + CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +-- +cgit v1.1-6-g87c4 + + diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 8484b4a..3348695 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -56,9 +56,10 @@ # Modifications for qt 5.9.4 2018 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.9.5 2018 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.9.6 2018 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.11.0 2018 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.9.6} +VERSION=${VERSION:-5.11.1} BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -126,10 +127,10 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf qt-everywhere-opensource-src-$VERSION -echo "Extracting qt-everywhere-opensource-src-$VERSION.tar.xz" -tar xf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz || exit 1 -cd qt-everywhere-opensource-src-$PKGSRC || exit 1 +rm -rf qt-everywhere-src-$VERSION +echo "Extracting qt-everywhere-src-$VERSION.tar.xz" +tar xf $CWD/qt-everywhere-src-$VERSION.tar.xz || exit 1 +cd qt-everywhere-src-$PKGSRC || exit 1 chown -R root:root . find . \ @@ -149,9 +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 -sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \ - -i qtbase/mkspecs/features/create_cmake.prf +## 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: @@ -163,10 +165,10 @@ else fi # Use our custom compiler and linker flags: -#sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/g++-base.conf || exit 1 -sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1 -sed -i -e "s/-O3/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1 -sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-base.conf || exit 1 +sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \ + -i qtbase/mkspecs/common/gcc-base.conf || exit 1 +sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \ + -i qtbase/mkspecs/common/g++-unix.conf || exit 1 # Enable h.264 codec support: echo "WEBENGINE_CONFIG += use_proprietary_codecs" >> qtwebengine/.qmake.conf @@ -177,10 +179,10 @@ echo "CONFIG += lang-all" >> qtvirtualkeyboard/.qmake.conf export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -export QTDIR="${TMP}/qt-everywhere-opensource-src-${PKGSRC}" +export QTDIR="${TMP}/qt-everywhere-src-${PKGSRC}" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -./configure \ +./configure -v \ -confirm-license \ -opensource \ -prefix /usr \ @@ -218,8 +220,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" ${PACONF} \ ${RELOCATIONS} \ -no-pch \ - OPENSSL_INCDIR="/usr/include/openssl-1.0" \ - OPENSSL_LIBDIR="/usr/lib${LIBDIRSUFFIX}/openssl-1.0" \ # No-precompiled-headers is ccache-friendly. # Sometimes a failure happens when parallelizing make. Try again if make fails, -- cgit v1.2.3