[SCM] qjackctl/master: Remove shutdown.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Jul 9 09:24:58 UTC 2011


The following commit has been merged in the master branch:
commit 88e799e152a1743360007d79166e3e07f1dc51cd
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 9 11:24:36 2011 +0200

    Remove shutdown.patch, applied upstream.

diff --git a/debian/patches/series b/debian/patches/series
index da2267e..d1026f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 00_settings.patch
-shutdown.patch
 desktop-crlf.patch
diff --git a/debian/patches/shutdown.patch b/debian/patches/shutdown.patch
deleted file mode 100644
index 21da141..0000000
--- a/debian/patches/shutdown.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624198
-Forwarded: yes
-Applied-Upstream: 0.3.8, svn r685
-Description: Prevent segfault upon "stop"
- If system ports were connected directly, pressing "stop" would cause a
- segmentation fault. This patch fixes the issue.
-diff --git a/src/qjackctlConnect.cpp b/src/qjackctlConnect.cpp
-index 1604f5a..ce0e3c2 100644
---- a/src/qjackctlConnect.cpp
-+++ b/src/qjackctlConnect.cpp
-@@ -363,7 +364,12 @@ void qjackctlClientItem::setHilite ( bool bHilite )
- 		m_iHilite--;
- 
- 	// Set the new color.
--	const QPalette& pal = QTreeWidgetItem::treeWidget()->palette();
-+    QTreeWidget *widget = QTreeWidgetItem::treeWidget();
-+    if (NULL == widget) {
-+        return;
-+    }
-+
-+	const QPalette& pal = widget->palette();
- 	QTreeWidgetItem::setTextColor(0, m_iHilite > 0
- 		? (pal.base().color().value() < 0x7f ? Qt::darkCyan : Qt::darkBlue)
- 		: pal.text().color());

-- 
qjackctl packaging



More information about the pkg-multimedia-commits mailing list