diff options
| author | Dave Woodfall <dave@slackbuilds.org> | 2020-03-30 16:38:18 +0100 |
|---|---|---|
| committer | Dave Woodfall <dave@slackbuilds.org> | 2020-04-06 04:09:15 +0100 |
| commit | 0de27250de9d350ac3f8a44ab5265f23361675c2 (patch) | |
| tree | 12aab6bd5eee1275691887cef55b93e449375e62 /libraries/qt5/qt5.SlackBuild | |
| parent | 6c2ee3d6e4f1ce6b9e5d35ab811b7e9e314aba0e (diff) | |
libraries/qt5: Updated for version 5.12.7.
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 1395136349498..f1533bbc28a2a 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -50,8 +50,8 @@ PRGNAM=qt5 SRCNAM=${PRGNAM%%[[:digit:]]*} -VERSION=${VERSION:-5.12.6} -BUILD=${BUILD:-4} +VERSION=${VERSION:-5.12.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -164,18 +164,6 @@ cd qtbase | patch -p1 --verbose || exit 1 cd - 1>/dev/null -# CVE-2020-0569 (fixed in 5.14.0): -cd qtbase - cat $CWD/patches/qt5.cve-2020-0569.patch \ - | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - -# CVE-2020-0570 (fixed in 5.14.1): -cd qtbase - cat $CWD/patches/qt5.cve-2020-0570.patch \ - | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - # Use our custom compiler and linker flags: sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \ -i qtbase/mkspecs/common/gcc-base.conf || exit 1 @@ -183,7 +171,7 @@ sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \ -i qtbase/mkspecs/common/g++-unix.conf || exit 1 export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -std=c++14" +export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" export QTDIR="${TMP}/qt-everywhere-src-$VERSION" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" @@ -216,7 +204,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -no-rpath \ -no-strip \ -release \ - -c++std c++14 \ $USE_CCACHE \ $CODECS \ $PULSE \ @@ -293,14 +280,6 @@ Description: Qt5 Configuration Version: $VERSION EOF -# Fix internal linking for Qt5WebEngineCore.pc. -if [ "$WEBENGINE" = "yes" ]; then - sed -i \ - -e 's|-Wl,--start-group.* -Wl,--end-group||' \ - -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \ - $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc -fi - # Fix the path in prl files: find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; |