Package: qjackctl
Version: 0.3.9-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Maintainer,

When building qjackctl in Ubuntu the 00_settings patch is applied.
I understand that Debian doesn't use this patch. However, this causes a
FTBFS in Ubuntu since the patch doesn't cleanly apply. I have a patch to
the patch here that fixes the issue and allows it to be applied cleanly.

  * Update 00_settings.patch so that it applies correctly fixing FTBFS.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-25-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru qjackctl-0.3.9/debian/patches/00_settings.patch qjackctl-0.3.9/debian/patches/00_settings.patch
--- qjackctl-0.3.9/debian/patches/00_settings.patch	2012-05-22 08:15:35.000000000 -0500
+++ qjackctl-0.3.9/debian/patches/00_settings.patch	2012-06-21 14:02:43.000000000 -0500
@@ -1,22 +1,24 @@
 Description: Apply Debian-specific patches.
+  This patch was modified from the original debian patch. 
+  It changes the default jackd patch to /usr/bin/jackd.
+  In addition, the preset sample rate is 44100.
 Origin: Debian
+Author: Chris J Arges <chris.j.ar...@canonical.com>
 Forwarded: not-needed
----
- src/qjackctlSetup.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+Last-Update: <2012-06-21>
 
---- qjackctl.orig/src/qjackctlSetup.cpp
-+++ qjackctl/src/qjackctlSetup.cpp
-@@ -343,7 +343,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+--- qjackctl-0.3.9.orig/src/qjackctlSetup.cpp
++++ qjackctl-0.3.9/src/qjackctlSetup.cpp
+@@ -345,7 +345,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	}
  
  	m_settings.beginGroup("/Settings" + sSuffix);
--	preset.sServer      = m_settings.value("/Server", "jackd").toString();
-+	preset.sServer      = m_settings.value("/Server", "/usr/bin/jackd").toString();
+-	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
++	preset.sServerPrefix = m_settings.value("/Server", "/usr/bin/jackd").toString();
  	preset.sServerName  = m_settings.value("/ServerName").toString();
  	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();
  	preset.bSoftMode    = m_settings.value("/SoftMode", false).toBool();
-@@ -356,7 +356,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+@@ -358,7 +358,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	preset.bIgnoreHW    = m_settings.value("/IgnoreHW", false).toBool();
  	preset.iPriority    = m_settings.value("/Priority", 0).toInt();
  	preset.iFrames      = m_settings.value("/Frames", 1024).toInt();

Reply via email to