diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-08-01 12:13:38 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-08-01 12:13:38 +0000 |
| commit | b36ee793ac9c31b0461e51406059e6ec9224ce32 (patch) | |
| tree | 03f67145fa7b6b134eaec087989abd57822fe4fa /sysutils/k3b/files | |
| parent | 5f81fa6b3ee434691b2f4646ba9b0b41657ac6ac (diff) | |
| download | ports-b36ee793ac9c31b0461e51406059e6ec9224ce32.tar.gz ports-b36ee793ac9c31b0461e51406059e6ec9224ce32.zip | |
Notes
Diffstat (limited to 'sysutils/k3b/files')
| -rw-r--r-- | sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp b/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp index abe5006e3703..373bcaefa658 100644 --- a/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp +++ b/sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp @@ -1,5 +1,5 @@ --- src/core/k3bdefaultexternalprograms.cpp.orig Fri May 21 19:03:21 2004 -+++ src/core/k3bdefaultexternalprograms.cpp Sun Jul 11 12:24:22 2004 ++++ src/core/k3bdefaultexternalprograms.cpp Sat Jul 31 09:49:57 2004 @@ -30,6 +30,7 @@ #include <unistd.h> #include <sys/stat.h> @@ -134,7 +134,7 @@ K3bProcess::OutputCollector out( &vp ); vp << path << "-version"; -@@ -838,7 +839,7 @@ +@@ -838,14 +839,14 @@ K3bExternalBin* bin = 0; // probe version @@ -143,6 +143,14 @@ K3bProcess::OutputCollector out( &vp ); vp << path; + if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + // different locales make searching for the +- char difficult + // so we simply ignore it. +- int pos = out.output().find( QRegExp("DVD.*RW format utility") ); ++ int pos = out.output().find( QRegExp("DVD.*RW.* format utility") ); + if( pos < 0 ) + return false; + @@ -913,7 +914,7 @@ K3bExternalBin* bin = 0; |