rev 19272 - in kde-extras/k3b/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2012-07-08 20:34:45 +0000 (Sun, 08 Jul 2012)
New Revision: 19272

Added:
   kde-extras/k3b/trunk/debian/patches/fix-sox-detection-with-sox-14.4.0.patch
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/series
Log:
add fix-sox-detection-with-sox-14.4.0.patch (#675737)

backported from upstream to fix the detection of sox >= 14.4


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2012-07-08 20:15:13 UTC (rev 19271)
+++ kde-extras/k3b/trunk/debian/changelog	2012-07-08 20:34:45 UTC (rev 19272)
@@ -2,6 +2,8 @@
 
   [ Pino Toscano ]
   * Compress k3b-data and k3b-i18n as xz.
+  * Add fix-sox-detection-with-sox-14.4.0.patch (backported from upstream
+    branch 2.0) to fix the detection of sox >= 14.4. (Closes: #675737)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 08 Jul 2012 22:11:41 +0200
 

Added: kde-extras/k3b/trunk/debian/patches/fix-sox-detection-with-sox-14.4.0.patch
===================================================================
--- kde-extras/k3b/trunk/debian/patches/fix-sox-detection-with-sox-14.4.0.patch	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/fix-sox-detection-with-sox-14.4.0.patch	2012-07-08 20:34:45 UTC (rev 19272)
@@ -0,0 +1,32 @@
+From 2b672a2928d57b1132644ee4da1d6c664050bce1 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 8 Jul 2012 22:20:15 +0200
+Subject: [PATCH] fix sox detection with sox >= 14.4.0
+
+sox 1.14.0 changed the string that is printed out on --version, breaking the simply string matching done;
+add a new case to cover also this new version
+
+BUG: 301544
+
+(cherry picked from commit 79cd49cac3a6b7031556aae53ce3ecff8c360cb9)
+---
+ plugins/encoder/sox/k3bsoxencoder.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
+index 62d2bcd..72a3dc0 100644
+--- a/plugins/encoder/sox/k3bsoxencoder.cpp
++++ b/plugins/encoder/sox/k3bsoxencoder.cpp
+@@ -69,6 +69,9 @@ public:
+             if ( pos >= 0 ) {
+                 pos += 17;
+             }
++            else if ( ( pos = out.indexOf( "sox:      SoX v" ) ) >= 0 ) {
++                pos += 15;
++            }
+             else if ( ( pos = out.indexOf( "sox: SoX v" ) ) >= 0 ) {
+                 pos += 10;
+             }
+-- 
+1.7.10.4
+

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2012-07-08 20:15:13 UTC (rev 19271)
+++ kde-extras/k3b/trunk/debian/patches/series	2012-07-08 20:34:45 UTC (rev 19272)
@@ -8,3 +8,4 @@
 114_bug587996_bdr_capacity_fix.diff
 k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch
 k3bsetup-put-the-shebang-in-the-first-line.patch
+fix-sox-detection-with-sox-14.4.0.patch