Add a patch that fixes a problem with detection of the dvd+rw-format

executable.

Submitted by: maintainer

6 files changed, 26 insertions, 6 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 92aa1281573f..bbb9b25698ab 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	0.11.12
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/k3b-kde4/distinfo b/sysutils/k3b-kde4/distinfo
index 0527239a1985..2c8526e0fc36 100644
--- a/sysutils/k3b-kde4/distinfo
+++ b/sysutils/k3b-kde4/distinfo
@@ -1,2 +1,3 @@
 MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5
-SIZE (k3b-0.11.12.tar.bz2) = 3187611
\ No newline at end of file
+SIZE (k3b-0.11.12.tar.bz2) = 3187611
+
diff --git a/sysutils/k3b-kde4/files/patch-src-core-k3bdefaultexternalprograms.cpp b/sysutils/k3b-kde4/files/patch-src-core-k3bdefaultexternalprograms.cpp
index abe5006e3703..373bcaefa658 100644
--- a/sysutils/k3b-kde4/files/patch-src-core-k3bdefaultexternalprograms.cpp
+++ b/sysutils/k3b-kde4/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;
  
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 92aa1281573f..bbb9b25698ab 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	0.11.12
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 0527239a1985..2c8526e0fc36 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,2 +1,3 @@
 MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5
-SIZE (k3b-0.11.12.tar.bz2) = 3187611
\ No newline at end of file
+SIZE (k3b-0.11.12.tar.bz2) = 3187611
+
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;