[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.7.2-1-4-gfd58360

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sat Dec 17 23:05:53 UTC 2011


The following commit has been merged in the master branch:
commit 08b9a69e82eea4dc6af3b2e4b6d1e050d08ca048
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Dec 17 23:32:57 2011 +0100

    Add kscd_dont_crash_if_device_is_emtpy.diff
---
 debian/changelog                                   |    4 ++++
 .../kscd_dont_crash_if_device_is_emtpy.diff        |   17 +++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7c083b..afd1683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ kdemultimedia (4:4.7.4-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ José Manuel Santamaría Lema ]
+  * Add kscd_dont_crash_if_device_is_emtpy.diff to prevent a crash when
+    starting kscd without disc in the device.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 Dec 2011 20:05:15 +0100
 
 kdemultimedia (4:4.7.2-1) experimental; urgency=low
diff --git a/debian/patches/kscd_dont_crash_if_device_is_emtpy.diff b/debian/patches/kscd_dont_crash_if_device_is_emtpy.diff
new file mode 100644
index 0000000..065d07d
--- /dev/null
+++ b/debian/patches/kscd_dont_crash_if_device_is_emtpy.diff
@@ -0,0 +1,17 @@
+Origin: http://websvn.kde.org/?view=revision&revision=1268881
+Description: This patch prevents a kscd crash when this program is started
+ without having a disc in the device.
+Applied-Upstream: 4.8.0
+--- a/kscd/kscd.cpp
++++ b/kscd/kscd.cpp
+@@ -69,7 +69,9 @@ KSCD::KSCD( QWidget *parent ) : KscdWind
+ 
+ 	/** Music Brainz initialisation	*/
+ 	m_MBManager = new MBManager();
+-	m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName());
++	if (devices->getMedia()) {
++		m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName());
++	}
+ 
+ 	setupActions();
+ 	setupContextMenu();
diff --git a/debian/patches/series b/debian/patches/series
index b5e7d70..e008dce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kmix_showeverywhere.diff
 fix_target_link_libraries.diff
 libav_compat.diff
+kscd_dont_crash_if_device_is_emtpy.diff

-- 
KDE Multimedia module packaging



More information about the pkg-kde-commits mailing list