From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 29 19:30:13 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3387516A4CE for ; Sun, 29 Aug 2004 19:30:13 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0683443D54 for ; Sun, 29 Aug 2004 19:30:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7TJUCDM014449 for ; Sun, 29 Aug 2004 19:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7TJUCnK014447; Sun, 29 Aug 2004 19:30:12 GMT (envelope-from gnats) Resent-Date: Sun, 29 Aug 2004 19:30:12 GMT Resent-Message-Id: <200408291930.i7TJUCnK014447@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Heiner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD5CA16A4CF for ; Sun, 29 Aug 2004 19:22:13 +0000 (GMT) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 84FF743D3F for ; Sun, 29 Aug 2004 19:22:12 +0000 (GMT) (envelope-from h.eichmann@gmx.de) Received: (qmail 4530 invoked by uid 65534); 29 Aug 2004 19:22:10 -0000 Received: from pD9EC32CA.dip.t-dialin.net (EHLO [192.168.254.42]) (217.236.50.202) by mail.gmx.net (mp027) with SMTP; 29 Aug 2004 21:22:10 +0200 Message-Id: <200408292126.33257.h.eichmann@gmx.de> Date: Sun, 29 Aug 2004 20:26:33 +0100 From: Heiner To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/71113: Port upgrade: sysutils/k3b to 0.11.14 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Aug 2004 19:30:13 -0000 >Number: 71113 >Category: ports >Synopsis: Port upgrade: sysutils/k3b to 0.11.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Aug 29 19:30:12 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Heiner Eichmann >Release: FreeBSD 4.10-STABLE i386 >Organization: Sirius Cybernetics Corp. >Environment: FreeBSD 7of9.unimatrix-zero.borg 4.10-STABLE FreeBSD 4.10-STABLE #1: Sun Jun 20 14:49:25 CEST 2004 root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: Upgrade to 0.11.14. PR 69310 is taken into account. Changes (according to www.k3b.org): K3b burns DVD+R Double Layer Media! Since version 0.11.13 K3b properly detects DVD+R Double Layer media, displays media info for DVD+R DL media, and burns DVD+R DL media in combination with dvd+rw-tools 5.20.4.10.8. Again I have to thank Andy Polyakov for his help on the K3b DVD burning support. Apart from that K3b 0.11.13 fixes some issues: * Improved Mad Plugin, way more reliable mp3 file detection. * Fixed cddb local file naming for disc ids with less than 8 digits. * Properly disable all buttons in the copy dialogs if no writer is installed and only create image is selected. * Fixed VideoDVD on-the-fly writing problem. * Select appropriate raw writing mode if raw96r is not supported. * Properly save the device search path. Now hotplug devices should be detected properly on every K3b restart. * Properly detect dvd+rw-format version >= 4.10. * Improved the raw toc data hex/bcd check. This should fix problems with drives providing totally bogus raw toc data. >How-To-Repeat: >Fix: See attached diff Delete files/patch-src-core-k3bdefaultexternalprograms.cpp files/patch-src-core-k3bprocess.cpp files/patch-src-core-k3bprocess.h --Boundary-00=_p3iMBHu4bQ0q7at Content-Type: text/x-diff; charset="iso-8859-1"; name="diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="diff" diff -urN ../../sysutils/k3b/Makefile ./Makefile --- ../../sysutils/k3b/Makefile Sun Aug 1 14:13:38 2004 +++ ./Makefile Sun Aug 15 15:31:18 2004 @@ -6,8 +6,7 @@ # PORTNAME= k3b -PORTVERSION= 0.11.12 -PORTREVISION= 1 +PORTVERSION= 0.11.14 CATEGORIES= sysutils multimedia kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -33,7 +32,7 @@ USE_REINPLACE= yes pre-configure: - ${REINPLACE_CMD} "s,-O2 ,,g" ${WRKSRC}/configure +# ${REINPLACE_CMD} "s,-O2 ,,g" ${WRKSRC}/configure .for i in config.h.in Makefile.in ${TOUCH} ${WRKSRC}/${i} .endfor diff -urN ../../sysutils/k3b/distinfo ./distinfo --- ../../sysutils/k3b/distinfo Sun Aug 1 14:13:38 2004 +++ ./distinfo Tue Aug 10 22:30:21 2004 @@ -1,3 +1,2 @@ -MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5 -SIZE (k3b-0.11.12.tar.bz2) = 3187611 - +MD5 (k3b-0.11.14.tar.bz2) = c990df553515c8a5107df796afa4d091 +SIZE (k3b-0.11.14.tar.bz2) = 3189709 \ No newline at end of file diff -urN ../../sysutils/k3b/files/patch-src-Makefile.in ./files/patch-src-Makefile.in --- ../../sysutils/k3b/files/patch-src-Makefile.in Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-Makefile.in Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig Thu Jun 24 19:34:03 2004 -+++ src/Makefile.in Sun Jul 11 12:24:22 2004 +--- src/Makefile.in.orig Tue Aug 10 12:56:08 2004 ++++ src/Makefile.in Sun Aug 22 15:28:36 2004 @@ -287,7 +287,7 @@ #>+ 1 k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp diff -urN ../../sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp ./files/patch-src-core-k3bdefaultexternalprograms.cpp --- ../../sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp Sun Aug 1 14:13:38 2004 +++ ./files/patch-src-core-k3bdefaultexternalprograms.cpp Thu Jan 1 01:00:00 1970 @@ -1,162 +0,0 @@ ---- src/core/k3bdefaultexternalprograms.cpp.orig Fri May 21 19:03:21 2004 -+++ src/core/k3bdefaultexternalprograms.cpp Sat Jul 31 09:49:57 2004 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include "k3bprocess.h" - - - -@@ -123,7 +124,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - K3bProcess::OutputCollector out( &vp ); - - vp << path << "-version"; -@@ -162,7 +163,7 @@ - - - // probe features -- KProcess fp; -+ MyKProcess fp; - out.setProcess( &fp ); - fp << path << "-help"; - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -236,7 +237,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - K3bProcess::OutputCollector out( &vp ); - - vp << path << "-version"; -@@ -265,7 +266,7 @@ - - - // probe features -- KProcess fp; -+ MyKProcess fp; - out.setProcess( &fp ); - fp << path << "-help"; - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -321,7 +322,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - vp << path << "-version"; - K3bProcess::OutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -349,7 +350,7 @@ - - - // probe features -- KProcess fp; -+ MyKProcess fp; - fp << path << "-help"; - out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -410,7 +411,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - vp << path << "-version"; - K3bProcess::OutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -438,7 +439,7 @@ - - - // probe features -- KProcess fp; -+ MyKProcess fp; - fp << path << "-help"; - out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -498,7 +499,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - vp << path ; - K3bProcess::OutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -530,7 +531,7 @@ - - - // probe features -- KProcess fp; -+ MyKProcess fp; - fp << path << "write" << "-h"; - out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -599,7 +600,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - vp << path ; - K3bProcess::OutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -653,7 +654,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - vp << path << "-V"; - K3bProcess::OutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { -@@ -710,7 +711,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - K3bProcess::OutputCollector out( &vp ); - - vp << path << "--version"; -@@ -769,7 +770,7 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - K3bProcess::OutputCollector out( &vp ); - - vp << path << "-version"; -@@ -838,14 +839,14 @@ - K3bExternalBin* bin = 0; - - // probe version -- KProcess vp; -+ MyKProcess vp; - 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; - - // probe version -- KProcess vp; -+ MyKProcess vp; - K3bProcess::OutputCollector out( &vp ); - - vp << path << "-h"; diff -urN ../../sysutils/k3b/files/patch-src-core-k3bprocess.cpp ./files/patch-src-core-k3bprocess.cpp --- ../../sysutils/k3b/files/patch-src-core-k3bprocess.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-core-k3bprocess.cpp Thu Jan 1 01:00:00 1970 @@ -1,63 +0,0 @@ ---- src/core/k3bprocess.cpp.orig Sun Feb 1 09:18:58 2004 -+++ src/core/k3bprocess.cpp Sun Jul 11 12:24:22 2004 -@@ -28,6 +28,60 @@ - #include - #include - #include -+#include -+#include -+#include -+MyKProcess & MyKProcess::operator<<(const QString& arg) -+{ -+ m_args += " " + arg; -+ return *this; -+} -+ -+MyKProcess &MyKProcess::operator<<(const char * arg) -+{ -+ m_args += " "; -+ m_args += arg; -+ return *this; -+} -+ -+MyKProcess &MyKProcess::operator<<(const QCString & arg) -+{ -+ m_args += " " + arg; -+ return *this; -+} -+ -+bool MyKProcess::start(KProcess::RunMode runmode, KProcess::Communication comm) -+{ -+ // create temp file -+ KTempFile tmpfile; -+ tmpfile.setAutoDelete(true); -+ -+ // create call -+ QString call = "/bin/sh -c \"" + m_args + " > " + tmpfile.name() + " 2>&1 \""; -+ printf("MyKProcess call: %s\n", call.latin1()); -+ -+ // execute it -+ system(call.latin1()); -+ -+ // read tmp file line by line -+ QFile tmp (tmpfile.name()); -+ if ( tmp.open( IO_ReadOnly ) ) -+ { -+ QTextStream stream( &tmp ); -+ while ( !stream.eof() ) -+ { -+ QString s = stream.readLine() + "\n"; -+ printf("MyKProcess reponse: %s", s.latin1()); -+ -+ // send line to receivedStdout signal -+ receivedStdout(this, (char *)s.latin1(), strlen(s.latin1())); -+ } -+ -+ // close and delete tmp file -+ tmp.close(); -+ } -+ return true; -+} - - - diff -urN ../../sysutils/k3b/files/patch-src-core-k3bprocess.h ./files/patch-src-core-k3bprocess.h --- ../../sysutils/k3b/files/patch-src-core-k3bprocess.h Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-core-k3bprocess.h Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ ---- src/core/k3bprocess.h.orig Tue Jan 27 09:19:13 2004 -+++ src/core/k3bprocess.h Sun Jul 11 12:24:22 2004 -@@ -194,4 +194,21 @@ - KProcess* m_process; - }; - -+/** This is a KProcess fake class. It uses system() to call the process -+ * and waits for its return. It redirects all output into a file and -+ * reads this file after the system() call. The redirected output -+ * (out and err!) is sent to the receivedStdout signal. This eliminates -+ * the problem reported as bug -+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/51651 -+ */ -+class MyKProcess : public KProcess -+{ -+ Q_OBJECT -+ QString m_args; -+public: -+ MyKProcess &operator<<(const QString& arg); -+ MyKProcess &operator<<(const char * arg); -+ MyKProcess &operator<<(const QCString & arg); -+ bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication); -+}; - #endif diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp ./files/patch-src-device-k3bdevice.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp Sat Aug 28 15:57:16 2004 +++ ./files/patch-src-device-k3bdevice.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ ---- src/device/k3bdevice.cpp.orig Wed Jun 23 12:06:46 2004 -+++ src/device/k3bdevice.cpp Sat Aug 28 15:56:16 2004 +--- src/device/k3bdevice.cpp.orig Tue Aug 10 09:45:21 2004 ++++ src/device/k3bdevice.cpp Sun Aug 29 10:41:17 2004 @@ -57,6 +57,13 @@ #endif // Q_OS_LINUX @@ -14,7 +14,7 @@ #ifdef HAVE_RESMGR extern "C" { -@@ -153,8 +160,10 @@ +@@ -154,8 +161,10 @@ d->supportedProfiles = 0; @@ -25,7 +25,7 @@ // -@@ -193,6 +202,7 @@ +@@ -194,6 +203,7 @@ unsigned char header[2048]; ::memset( header, 0, 2048 ); @@ -33,7 +33,7 @@ cmd[0] = MMC::GET_CONFIGURATION; cmd[8] = 8; if( cmd.transport( TR_DIR_READ, header, 8 ) ) { -@@ -752,6 +762,14 @@ +@@ -754,6 +764,14 @@ m_bufferSize = 1024; d->burnfree = false; } @@ -48,7 +48,7 @@ else if( vendor().startsWith("MATSHITA") ) { if( description().startsWith("CD-R CW-7501") ) { m_writeModes = TAO|SAO; -@@ -2559,10 +2577,12 @@ +@@ -2597,10 +2615,12 @@ { // if the device is already opened we do not close it // to allow fast multible method calls in a row @@ -61,7 +61,7 @@ // header size is 8 unsigned char* buffer = 0; -@@ -2648,13 +2668,16 @@ +@@ -2686,13 +2706,16 @@ delete [] buffer; } diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.h ./files/patch-src-device-k3bdevice.h --- ../../sysutils/k3b/files/patch-src-device-k3bdevice.h Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-device-k3bdevice.h Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ ---- src/device/k3bdevice.h.orig Wed Jun 9 18:36:58 2004 -+++ src/device/k3bdevice.h Sun Jul 11 12:24:22 2004 +--- src/device/k3bdevice.h.orig Thu Jul 29 12:07:16 2004 ++++ src/device/k3bdevice.h Sun Aug 22 15:28:36 2004 @@ -677,6 +677,10 @@ class Private; diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp ./files/patch-src-device-k3bdevicemanager.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-device-k3bdevicemanager.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ ---- src/device/k3bdevicemanager.cpp.orig Tue Jun 22 21:50:55 2004 -+++ src/device/k3bdevicemanager.cpp Sun Jul 11 12:24:22 2004 +--- src/device/k3bdevicemanager.cpp.orig Sat Jul 17 11:50:08 2004 ++++ src/device/k3bdevicemanager.cpp Sun Aug 22 15:28:36 2004 @@ -49,6 +49,12 @@ #include #include @@ -35,7 +35,7 @@ scanFstab(); return m_foundDevices; -@@ -421,6 +435,7 @@ +@@ -423,6 +437,7 @@ bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename) { bool ret = false; @@ -43,7 +43,7 @@ int cdromfd = K3bCdDevice::openDevice( devicename.ascii() ); if (cdromfd < 0) { kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl; -@@ -461,11 +476,36 @@ +@@ -463,11 +478,36 @@ } ::close( cdromfd ); @@ -80,7 +80,7 @@ K3bDevice* device = 0; // resolve all symlinks -@@ -497,6 +537,7 @@ +@@ -499,6 +539,7 @@ device->m_target = target; device->m_lun = lun; } @@ -88,7 +88,7 @@ if( !device->init() ) { kdDebug() << "Could not initialize device " << devicename << endl; -@@ -572,9 +613,20 @@ +@@ -574,9 +615,20 @@ if( K3bDevice* dev = findDevice( resolveSymLink(md) ) ) { @@ -109,7 +109,7 @@ dev->setMountDevice( md ); dev->m_supermount = supermount; } -@@ -583,6 +635,8 @@ +@@ -585,6 +637,8 @@ { // compare bus, id, lun since the same device can for example be // determined as /dev/srX or /dev/scdX @@ -118,7 +118,7 @@ int bus = -1, id = -1, lun = -1; if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) { if( K3bDevice* dev = findDevice( bus, id, lun ) ) { -@@ -593,6 +647,17 @@ +@@ -595,6 +649,17 @@ } } } @@ -136,7 +136,7 @@ } -@@ -668,5 +733,131 @@ +@@ -670,5 +735,131 @@ return QString::fromLatin1( resolved ); } diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h ./files/patch-src-device-k3bdevicemanager.h --- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-device-k3bdevicemanager.h Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bdevicemanager.h Sun Jul 11 12:24:22 2004 ++++ src/device/k3bdevicemanager.h Sun Aug 22 15:28:36 2004 @@ -112,6 +112,10 @@ class Private; diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp ./files/patch-src-device-k3bscsicommand.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-device-k3bscsicommand.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bscsicommand.cpp Sun Jul 11 12:24:22 2004 ++++ src/device/k3bscsicommand.cpp Sun Aug 22 15:28:36 2004 @@ -58,13 +58,14 @@ diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h ./files/patch-src-device-k3bscsicommand.h --- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-device-k3bscsicommand.h Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bscsicommand.h Sun Jul 11 12:24:22 2004 ++++ src/device/k3bscsicommand.h Sun Aug 22 15:28:36 2004 @@ -17,9 +17,27 @@ #define _K3B_SCSI_COMMAND_H_ diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp ./files/patch-src-rip-k3bdvdrippingprocess.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-rip-k3bdvdrippingprocess.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004 -+++ src/rip/k3bdvdrippingprocess.cpp Sun Jul 11 12:24:22 2004 ++++ src/rip/k3bdvdrippingprocess.cpp Sun Aug 22 15:28:36 2004 @@ -285,10 +285,13 @@ void K3bDvdRippingProcess::slotPreProcessingDvd() { QString video; diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp ./files/patch-src-rip-k3bmovieview.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-rip-k3bmovieview.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004 -+++ src/rip/k3bmovieview.cpp Sun Jul 11 12:24:22 2004 ++++ src/rip/k3bmovieview.cpp Sun Aug 22 15:28:36 2004 @@ -223,8 +223,11 @@ } diff -urN ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp ./files/patch-src-rip-k3btcwrapper.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-rip-k3btcwrapper.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ --- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004 -+++ src/rip/k3btcwrapper.cpp Sun Jul 11 12:24:22 2004 ++++ src/rip/k3btcwrapper.cpp Sun Aug 22 15:28:36 2004 @@ -65,7 +65,12 @@ //K3bProcess *p = new K3bProcess(); emit tcprobeTitleParsed( m_currentTitle ); diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp ./files/patch-src-rip-k3bvideocdrip.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp Tue Jul 20 03:19:58 2004 +++ ./files/patch-src-rip-k3bvideocdrip.cpp Sun Aug 29 10:42:11 2004 @@ -1,5 +1,5 @@ ---- src/rip/k3bvideocdrip.cpp.orig Sun Jul 11 15:13:42 2004 -+++ src/rip/k3bvideocdrip.cpp Sun Jul 11 15:14:07 2004 +--- src/rip/k3bvideocdrip.cpp.orig Wed Jan 21 11:20:20 2004 ++++ src/rip/k3bvideocdrip.cpp Sun Aug 22 15:28:36 2004 @@ -41,7 +41,8 @@ m_ripsourceType( 0 ), m_videooptions( options ), --Boundary-00=_p3iMBHu4bQ0q7at-- >Release-Note: >Audit-Trail: >Unformatted: --Boundary-00=_p3iMBHu4bQ0q7at Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline X-send-pr-version: send-pr 3.113 X-GNATS-Notify: