summaryrefslogtreecommitdiffstats
path: root/libraries/qt5/qt5.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
-rw-r--r--libraries/qt5/qt5.SlackBuild27
1 files changed, 3 insertions, 24 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 1395136349..f1533bbc28 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/' {} \;