Bug#725864: pu: package smplayer/0.8.0-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
I'd like to upload a fix for bug#723707 to stable.
The minimalistic patch is attached.
Thanks for considering.
--
Alessio Treglia | www.alessiotreglia.com
Debian Developer | alessio@debian.org
Ubuntu Core Developer | quadrispro@ubuntu.com
0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A
diff -Nru smplayer-0.8.0/debian/changelog smplayer-0.8.0/debian/changelog
--- smplayer-0.8.0/debian/changelog 2012-04-14 06:08:32.000000000 +0100
+++ smplayer-0.8.0/debian/changelog 2013-10-09 11:16:55.000000000 +0100
@@ -1,3 +1,10 @@
+smplayer (0.8.0-1+wheezy1) stable; urgency=low
+
+ * Don't append -fontconfig to the command line options for Mplayer2
+ to prevent crash at startup. (Closes: #723707)
+
+ -- Alessio Treglia <alessio@debian.org> Wed, 09 Oct 2013 11:16:21 +0100
+
smplayer (0.8.0-1) unstable; urgency=low
[ Maia Kozheva ]
diff -Nru smplayer-0.8.0/debian/gbp.conf smplayer-0.8.0/debian/gbp.conf
--- smplayer-0.8.0/debian/gbp.conf 2012-04-09 06:38:18.000000000 +0100
+++ smplayer-0.8.0/debian/gbp.conf 2013-10-09 11:00:08.000000000 +0100
@@ -1,3 +1,5 @@
[DEFAULT]
+debian-branch = master.stable
+upstream-branch = upstream.stable
pristine-tar = True
compression = bzip2
diff -Nru smplayer-0.8.0/debian/patches/1001-dont_use_fontconfig.patch smplayer-0.8.0/debian/patches/1001-dont_use_fontconfig.patch
--- smplayer-0.8.0/debian/patches/1001-dont_use_fontconfig.patch 1970-01-01 01:00:00.000000000 +0100
+++ smplayer-0.8.0/debian/patches/1001-dont_use_fontconfig.patch 2013-10-09 11:04:51.000000000 +0100
@@ -0,0 +1,32 @@
+Description: Don't append -fontconfig to mplayer2's command line, which does not support it anymore.
+Origin: https://www.assembla.com/code/smplayer/subversion/commit/4683
+Applied-Upstream: commit:4683
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=723707
+---
+ src/core.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- smplayer.orig/src/core.cpp
++++ smplayer/src/core.cpp
+@@ -1702,7 +1702,9 @@ void Core::startMplayer( QString file, d
+ // Use the same font for OSD
+ #if !defined(Q_OS_OS2)
+ if (!pref->ass_styles.fontname.isEmpty()) {
+- proc->addArgument("-fontconfig");
++ if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
++ proc->addArgument("-fontconfig");
++ }
+ proc->addArgument("-font");
+ proc->addArgument( pref->ass_styles.fontname );
+ }
+@@ -1721,7 +1723,9 @@ void Core::startMplayer( QString file, d
+ if (pref->freetype_support) proc->addArgument("-noass");
+ #if !defined(Q_OS_OS2)
+ if ( (pref->use_fontconfig) && (!pref->font_name.isEmpty()) ) {
+- proc->addArgument("-fontconfig");
++ if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
++ proc->addArgument("-fontconfig");
++ }
+ proc->addArgument("-font");
+ proc->addArgument( pref->font_name );
+ }
diff -Nru smplayer-0.8.0/debian/patches/series smplayer-0.8.0/debian/patches/series
--- smplayer-0.8.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ smplayer-0.8.0/debian/patches/series 2013-10-09 11:00:41.000000000 +0100
@@ -0,0 +1 @@
+1001-dont_use_fontconfig.patch
Reply to: