diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-05-27 11:29:24 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-05-27 11:29:24 +0000 |
| commit | 1fb4d252cd6e0f35b0f101d02ed1aad32a8abe62 (patch) | |
| tree | 3572a85b60eea5133b97d11afc7e408ab6ed4a52 /qt5 | |
| parent | 2a0b31d56f4375c2e226f419815dde0f5098dcfc (diff) | |
| download | asb-1fb4d252cd6e0f35b0f101d02ed1aad32a8abe62.tar.gz asb-1fb4d252cd6e0f35b0f101d02ed1aad32a8abe62.tar.xz | |
Apply a patch which fixes Plasma 5 locking issues.
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/build/qt5.SlackBuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild index 06608fc5..893d82c4 100755 --- a/qt5/build/qt5.SlackBuild +++ b/qt5/build/qt5.SlackBuild @@ -47,8 +47,9 @@ PKGNAM=qt5 VERSION=${VERSION:-5.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} +TAG=${TAG:-alien} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: @@ -128,6 +129,10 @@ cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 # See https://bugs.webkit.org/show_bug.cgi?id=117077 cat $CWD/patches/platformplugin-install-path-fix.patch | patch -p1 --verbose || exit 1 +# QLockFile: fix deadlock when the lock file is corrupted. +# See https://bugreports.qt.io/browse/QTBUG-44771 +cat $CWD/patches/qt5.qlockfile-deadlock.patch | patch -p1 --verbose || exit 1 + 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 @@ -293,5 +298,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz |