summaryrefslogtreecommitdiff
path: root/libre/smplayer
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-06 00:25:24 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-06 00:25:24 -0300
commit503020e6da5c9f865e0c69095b333b469368e867 (patch)
treeb5e7a2ad7f357ca01d3b0ca94acaeabd7a27109c /libre/smplayer
parente9531a765285fdce954927e3878d3c2ccf5e26dd (diff)
downloadabslibre-503020e6da5c9f865e0c69095b333b469368e867.tar.gz
abslibre-503020e6da5c9f865e0c69095b333b469368e867.tar.bz2
abslibre-503020e6da5c9f865e0c69095b333b469368e867.zip
smplayer-16.4.0-3.parabola1: fix kwin crash - FS#49216 -> https://bugs.archlinux.org/task/49216
Diffstat (limited to 'libre/smplayer')
-rw-r--r--libre/smplayer/PKGBUILD18
-rw-r--r--libre/smplayer/smplayer-dock-playlist-qt5.patch25
2 files changed, 36 insertions, 7 deletions
diff --git a/libre/smplayer/PKGBUILD b/libre/smplayer/PKGBUILD
index 1fa816f47..3d6973f39 100644
--- a/libre/smplayer/PKGBUILD
+++ b/libre/smplayer/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 266273 2016-04-27 16:49:26Z fyan $
-# Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 266952 2016-05-05 15:20:22Z arojas $
+# Maintainer (Arch):
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
# Contributor (Arch): Allan McRae <allan@archlinux.org>
# Contributor (Arch): Alessio 'mOLOk' Bolognino <themolok@gmail.com>
# Contributor (Arch): shamrok <szamrok@gmail.com>
@@ -8,7 +9,7 @@
pkgname=smplayer
pkgver=16.4.0
-pkgrel=2.parabola1
+pkgrel=3.parabola1
pkgdesc="A complete front-end for MPlayer, without nonfree smtube recommendation"
arch=('i686' 'x86_64' 'armv7h')
url="http://smplayer.sourceforge.net/"
@@ -18,11 +19,14 @@ makedepends=('qt5-tools')
optdepends=('smplayer-themes: icon themes collection'
'smplayer-skins: skin themes collection'
'mpv: for using mpv instead of mplayer')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 smplayer-dock-playlist-qt5.patch)
md5sums=('b89975a1edc60e1ea89159e4bd7cde07')
prepare() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
+# Fix crash in kwin
+ patch -p0 -i ../smplayer-dock-playlist-qt5.patch
+
sed -i 's|DEFINES [+][=] YOUTUBE_SUPPORT|#DEFINES += YOUTUBE_SUPPORT|
s|DEFINES [+][=] YT_USE_SCRIPT|#DEFINES += YT_USE_SCRIPT|
' src/smplayer.pro
@@ -32,14 +36,14 @@ prepare() {
}
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make PREFIX=/usr \
DOC_PATH="\\\"/usr/share/doc/smplayer\\\"" \
QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DOC_PATH=/usr/share/doc/smplayer \
DESTDIR="$pkgdir" PREFIX="/usr" install
}
diff --git a/libre/smplayer/smplayer-dock-playlist-qt5.patch b/libre/smplayer/smplayer-dock-playlist-qt5.patch
new file mode 100644
index 000000000..e6fa53c8d
--- /dev/null
+++ b/libre/smplayer/smplayer-dock-playlist-qt5.patch
@@ -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