1 files changed, 34 insertions, 30 deletions

diff --git a/multimedia/k9copy/files/patch-src_kcddrive.cpp b/multimedia/k9copy/files/patch-src_kcddrive.cpp
index a05b47882f74..4e9b134c7e6a 100644
--- a/multimedia/k9copy/files/patch-src_kcddrive.cpp
+++ b/multimedia/k9copy/files/patch-src_kcddrive.cpp
@@ -1,30 +1,34 @@
---- src/kcddrive.cpp.orig      Thu Dec 15 16:49:47 2005
-+++ src/kcddrive.cpp   Thu Dec 15 16:49:47 2005
-@@ -27,8 +27,10 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+/*
- #include <scsi/scsi.h>
- #include <scsi/sg.h>
-+*/
- #include <unistd.h>
-
- #include <qfile.h>
-@@ -177,7 +179,7 @@
-         return 0;
-     }
-
--    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
-+/*    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
-         close (fd);
-         return 0;
-     }
-@@ -185,6 +187,7 @@
-         close(fd);
-         return 0;
-     }
-+*/
-     id = m_idlun.mux4 & 0xFF;
-     lun = (m_idlun.mux4 >> 8)  & 0xFF;
-
+--- src/kcddrive.cpp.orig	Sun Dec 18 18:36:56 2005
++++ src/kcddrive.cpp	Fri Jan  6 18:01:33 2006
+@@ -21,6 +21,7 @@
+ 
+ #include "kcddrive.h"
+ #include <kprocess.h>
++#include <sys/param.h>
+ #include <sys/mount.h>
+ kCDDrive::kCDDrive() {
+     canReadDVD=false;
+@@ -55,7 +56,7 @@
+ 	if (process->isRunning()) process->wait(-1);
+ 	delete process;
+ */
+-	umount(device.latin1());
++	unmount(device.latin1(),0);
+ 	dev->eject();
+ 	}
+    }
+@@ -99,6 +100,7 @@
+ void kCDDrives::scanDrives() {
+     int i;
+     drives.clear();
++    dm->clear();
+     dm->scanBus();
+     dm->scanFstab();
+ 
+@@ -128,4 +130,4 @@
+ /** No descriptions */
+ kCDDrive * kCDDrives::getDrive(int num) {
+     return (kCDDrive *)drives.at(num);
+-}
+\ No newline at end of file
++}