Date: Thursday, May 5, 2016 @ 17:16:09 Author: arojas Revision: 266951
Fix kwin crash (FS#49216) Added: smplayer/trunk/smplayer-dock-playlist-qt5.patch Modified: smplayer/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 18 +++++++++++++----- smplayer-dock-playlist-qt5.patch | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-05 13:46:20 UTC (rev 266950) +++ PKGBUILD 2016-05-05 15:16:09 UTC (rev 266951) @@ -1,5 +1,6 @@ # $Id$ -# Maintainer : Ionut Biru <ib...@archlinux.org> +# Maintainer: +# Contributor: Ionut Biru <ib...@archlinux.org> # Contributor: Allan McRae <al...@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themo...@gmail.com> # Contributor: shamrok <szam...@gmail.com> @@ -17,11 +18,18 @@ 'smplayer-skins: skin themes collection' 'smtube: browse and play youtube videos' 'mpv: for using mpv instead of mplayer') -source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('b89975a1edc60e1ea89159e4bd7cde07') +source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 smplayer-dock-playlist-qt5.patch) +md5sums=('b89975a1edc60e1ea89159e4bd7cde07' + 'e0cfdf29daf815404501a11e7ebac2eb') +prepare() { + cd $pkgname-$pkgver +# Fix crash in kwin + patch -p0 -i ../smplayer-dock-playlist-qt5.patch +} + build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make PREFIX=/usr \ DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \ QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE @@ -28,7 +36,7 @@ } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DOC_PATH=/usr/share/doc/smplayer \ DESTDIR="$pkgdir" PREFIX="/usr" install } Added: smplayer-dock-playlist-qt5.patch =================================================================== --- smplayer-dock-playlist-qt5.patch (rev 0) +++ smplayer-dock-playlist-qt5.patch 2016-05-05 15:16:09 UTC (rev 266951) @@ -0,0 +1,25 @@ +--- src/guiconfig.h.orig 2016-05-05 17:05:45.131333069 +0200 ++++ src/guiconfig.h 2016-05-05 17:05:17.883829511 +0200 +@@ -19,12 +19,21 @@ + #ifndef GUICONFIG_H + #define GUICONFIG_H + ++#include <QtGlobal> + + // DOCK_PLAYLIST + // if 1, the playlist will be docked in the main window, instead + // of being a top level window +- ++#ifdef Q_OS_WIN + #define DOCK_PLAYLIST 1 ++#else ++ #if QT_VERSION >= 0x050000 ++ // There's problems with the playlist with Qt5 when using compiz ++ #define DOCK_PLAYLIST 0 ++ #else ++ #define DOCK_PLAYLIST 1 ++ #endif ++#endif + + + // AUTODISABLE_ACTIONS