diff options
author | Matteo Bernardini | 2020-01-03 23:09:25 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-01-03 23:09:25 +0100 |
commit | 95008285045d7130c028d6755dcc2bae5387cb22 (patch) | |
tree | 65f9ab22c4711d52dbe2d3a77112b00e4a8e051d /libraries/qt5/qt5.SlackBuild | |
parent | 66bb71ec178eb531b8a07c19457800341c8f0d9f (diff) | |
download | slackbuilds-current-20200103.1.tar.gz |
20200103.1 global branch merge.current-20200103.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
-rw-r--r-- | libraries/qt5/qt5.SlackBuild | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 0257c0c434..fbf652bb11 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -157,6 +157,21 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# Fix a missing header with kernel-5.4.x - Thanks to USUARIONUEVO +patch -p1 < $CWD/patches/kernel_5.4_qtserialbus.patch + +# Fix for gcc >= 8.x +if [ ! "$WEBENGINE" = "no" ]; then + ( cd qtwebengine + patch -p1 < $CWD/patches/qt5.webengine_gcc8.patch ) +fi + +( cd qtbase + # Support for openssl-1.1.x + patch -p1 < $CWD/patches/qtbase59-openssl11.patch + # Patch for mesa >= 19.2.2 + patch -p1 < $CWD/patches/eglfs_kms_egldevice.patch ) + # Limit -reduce-relocations to ix86 and x86_64. # https://bugreports.qt-project.org/browse/QTBUG-36129 if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then @@ -179,7 +194,7 @@ sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \ qtbase/mkspecs/common/gcc-base.conf export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -std=c++11" +export CXXFLAGS="$SLKCFLAGS" ./configure -v \ -confirm-license \ -opensource \ @@ -207,7 +222,6 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11" -no-strip \ -release \ -no-use-gold-linker \ - -c++std c++11 \ $CCACHE \ $CODECS \ $PULSE \ |