From 4ea919ffb77b502949edf5b0ecfec63dea0a8906 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 6 Dec 2016 20:54:23 +0000 Subject: qt5: apply patch for more stability after resume. --- qt5/build/qt5.SlackBuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'qt5') diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild index 0b5c52fd..089c09e7 100755 --- a/qt5/build/qt5.SlackBuild +++ b/qt5/build/qt5.SlackBuild @@ -53,7 +53,7 @@ PKGNAM=qt5 VERSION=${VERSION:-5.7.0} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -150,6 +150,11 @@ cd qtwebengine cat $CWD/patches/qt5.glibc224.patch | patch -p1 --verbose || exit 1 cd - +# Fix crash on exit when using default property aliases with layouts: +cd qtdeclarative + cat $CWD/patches/qt5.qtbug-51927.patch | patch -p1 --verbose || exit 1 +cd - + if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 @@ -163,6 +168,9 @@ 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 "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-base.conf || exit 1 +# Enable h.264 codec support: +echo "WEBENGINE_CONFIG += use_proprietary_codecs" >> qtwebengine/.qmake.conf + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -- cgit v1.2.3-79-gdb01