View | Details | Raw Unified | Return to bug 91356 | Differences between
and this patch

Collapse All | Expand All

(-)k9copy/distinfo Tue Jan 3 02:59:47 2006 (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (k9copy-1.0.1.tar.gz) = cc13f799a13784f7c9aaa2d40d608b0b
1
MD5 (k9copy-1.0.2.tar.gz) = 9037dfa804a6f758c5df7e641c67127d
2
SHA256 (k9copy-1.0.1.tar.gz) = 1111de1f6cee40f17e3a341f656b046f2a63a5b9debb68c9660c17d217d080bb
2
SHA256 (k9copy-1.0.2.tar.gz) = 1432c327ea38aeaffcfe34c99637ec90b09e31552c132a947a0a0f9e36dfa9e2
3
SIZE (k9copy-1.0.1.tar.gz) = 1206622
3
SIZE (k9copy-1.0.2.tar.gz) = 1154768
(-)k9copy/files/patch-libk3bdevice-k3bdevice.h Sun Dec 25 12:46:50 2005 (+10 lines)
Line 0 Link Here
1
--- libk3bdevice/k3bdevice.h.orig      Mon Dec 12 10:32:59 2005
2
+++ libk3bdevice/k3bdevice.h   Wed Dec 14 23:49:42 2005
3
@@ -28,6 +28,7 @@
4
5
 #ifdef Q_OS_FREEBSD
6
 struct cam_device;
7
+#define stat64 stat
8
 #endif
9
10
 namespace K3bDevice
(-)k9copy/files/patch-libk9copy_k9backupdlg.cpp Thu Jan 5 06:09:19 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9backupdlg.cpp.orig     Thu Jan  5 06:08:21 2006
2
+++ libk9copy/k9backupdlg.cpp  Thu Jan  5 06:08:38 2006
3
@@ -18,7 +18,11 @@
4
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
5
  ***************************************************************************/
6
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
 #include <qtimer.h>
14
 #include <qdatetime.h>
15
 #include <qapplication.h>
(-)k9copy/files/patch-libk9copy_k9cell.h Thu Jan 5 06:10:41 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9cell.h.orig    Thu Jan  5 06:09:52 2006
2
+++ libk9copy/k9cell.h Thu Jan  5 06:10:12 2006
3
@@ -22,7 +22,11 @@
4
5
 #include <qobject.h>
6
 #include <qobjectlist.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
 #include "k9dvdtitle.h"
14
 enum streamType_t {stAudio,stVideo,stSubpicture,stOther};
15
 /**
(-)k9copy/files/patch-libk9copy_k9cellcopylist.h Thu Jan 5 06:11:37 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9cellcopylist.h.orig    Thu Jan  5 06:10:57 2006
2
+++ libk9copy/k9cellcopylist.h Thu Jan  5 06:11:13 2006
3
@@ -24,7 +24,11 @@
4
 #include "k9dvd.h"
5
 #include "k9cell.h"
6
 #include <dvdread/ifo_types.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
14
 class k9CellCopyVTS {
15
 private:
(-)k9copy/files/patch-libk9copy_k9dvd.cpp Thu Jan 5 06:13:08 2006 (+44 lines)
Line 0 Link Here
1
--- libk9copy/k9dvd.cpp.orig   Fri Dec  9 19:18:03 2005
2
+++ libk9copy/k9dvd.cpp        Thu Jan  5 06:12:30 2006
3
@@ -27,7 +27,11 @@
4
 #include <stdio.h>
5
 #include <stdlib.h>
6
 #include <unistd.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
14
 #include "k9dvd.h"
15
 #include "k9dvdtitle.h"
16
@@ -196,7 +200,7 @@
17
         return -1;
18
     }
19
20
-    if ( fseek(filehandle, 32808, SEEK_SET )) {
21
+    if ( fseek(filehandle, 32768, SEEK_SET )) {
22
         fclose(filehandle);
23
         c.sprintf(tr2i18n("Couldn't seek in %s for title\n"), dvd_device);
24
         setError(c);
25
@@ -204,12 +208,18 @@
26
         return -1;
27
     }
28
29
-    if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
30
+    {
31
+    #define DVD_SEC_SIZ 2048
32
+    char tempBuf[ DVD_SEC_SIZ ];
33
+    if ( DVD_SEC_SIZ != fread(tempBuf, 1, DVD_SEC_SIZ, filehandle) ) {
34
         fclose(filehandle);
35
 //        c=tr2i18n("Couldn't read enough bytes for title.\n");
36
 //        setError(c);
37
         strcpy(title, "unknown");
38
         return 0;
39
+    }
40
+    snprintf( title, 32, "%s", tempBuf + 40 );
41
+    i=32;
42
     }
43
44
     fclose (filehandle);
(-)k9copy/files/patch-libk9copy_k9dvd.h Thu Jan 5 06:14:11 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9dvd.h.orig     Thu Jan  5 06:13:32 2006
2
+++ libk9copy/k9dvd.h  Thu Jan  5 06:13:58 2006
3
@@ -25,7 +25,11 @@
4
 #include <qobjectlist.h>
5
 #include <qdatetime.h>
6
 #include <qvaluelist.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
 #include <dvdread/ifo_types.h>
14
15
(-)k9copy/files/patch-libk9copy_k9dvdbackup.h Thu Jan 5 06:16:36 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9dvdbackup.h.orig       Thu Jan  5 06:16:05 2006
2
+++ libk9copy/k9dvdbackup.h    Thu Jan  5 06:16:20 2006
3
@@ -26,7 +26,11 @@
4
 #include <qobjectlist.h>
5
 #include "k9cell.h"
6
 #include <dvdread/ifo_types.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
 #include "k9cellcopylist.h"
14
 /**
15
 @author Jean-Michel Petit
(-)k9copy/files/patch-libk9copy_k9dvdtitle.cpp Thu Jan 5 06:17:43 2006 (+15 lines)
Line 0 Link Here
1
--- libk9copy/k9dvdtitle.cpp.orig      Thu Jan  5 06:16:57 2006
2
+++ libk9copy/k9dvdtitle.cpp   Thu Jan  5 06:17:14 2006
3
@@ -31,7 +31,11 @@
4
 #include <stdlib.h>
5
 #include <unistd.h>
6
 #include <qvaluelist.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
14
15
 //*******************k9DVDAudioStream**************
(-)k9copy/files/patch-libk9copy_k9ifo.cpp Tue Jan 3 03:21:11 2006 (+12 lines)
Line 0 Link Here
1
--- libk9copy/k9ifo.cpp.orig  Sun Dec 18 23:40:34 2005
2
+++ libk9copy/k9ifo.cpp       Sun Dec 18 23:40:52 2005
3
@@ -21,6 +21,9 @@
4
 #include <dvdread/dvd_reader.h>
5
 #include <dvdread/ifo_read.h>
6
 #include <dvdread/ifo_print.h>
7
+#ifdef __FreeBSD__
8
+#include <osreldate.h>
9
+#endif
10
 #include "bswap.h"
11
12
 #ifndef DVD_BLOCK_LEN
(-)k9copy/files/patch-src_K9copy.desktop Thu Jan 1 03:00:00 1970 (-10 lines)
Lines 1-10 Link Here
1
--- src/K9copy.desktop.orig    Tue Dec 20 16:03:59 2005
2
+++ src/K9copy.desktop Tue Dec 20 16:04:12 2005
3
@@ -3,6 +3,6 @@
4
 Name=k9copy
5
 Exec=k9copy -caption "%c" %i %m %u
6
 Comment=
7
-Icon=/home/jmp/dev/k9copy/src/k9copy.png
8
+Icon=k9copy
9
 MimeTypes=
10
 Terminal=false
(-)k9copy/files/patch-src_Makefile.in Tue Jan 3 04:59:02 2006 (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig       Tue Dec 20 16:07:46 2005
1
--- src/Makefile.in.orig       Tue Jan  3 04:57:30 2006
2
+++ src/Makefile.in    Tue Dec 20 16:09:14 2005
2
+++ src/Makefile.in    Tue Jan  3 04:57:42 2006
3
@@ -459,7 +459,7 @@
3
@@ -439,7 +439,7 @@
4
 shellrcdir = $(kde_datadir)/k9copy
4
 shellrcdir = $(kde_datadir)/k9copy
5
 shellrc_DATA = k9copyui.rc
5
 shellrc_DATA = k9copyui.rc
6
 applnkApplication_DATA = K9copy.desktop
6
 applnkApplication_DATA = K9copy.desktop
(-)k9copy/files/patch-src_kburndvd.cpp Thu Jan 5 06:06:42 2006 (+15 lines)
Line 0 Link Here
1
--- src/kburndvd.cpp.orig      Thu Jan  5 06:04:49 2006
2
+++ src/kburndvd.cpp   Thu Jan  5 06:05:18 2006
3
@@ -24,7 +24,11 @@
4
 #include <qdir.h>
5
 #include <kmessagebox.h>
6
 #include <kprocess.h>
7
-#include <stdint.h>
8
+#ifdef HAVE_STDINT_H
9
+       #include <stdint.h>
10
+#elif defined(HAVE_INTTYPES_H)
11
+       #include <inttypes.h>
12
+#endif
13
 #include <kfiledialog.h>
14
15
 kBurnDVD::kBurnDVD()
(-)k9copy/files/patch-src_kcddrive.cpp Wed Jan 4 22:50:34 2006 (-30 / +27 lines)
Lines 1-30 Link Here
1
--- src/kcddrive.cpp.orig      Thu Dec 15 16:49:47 2005
1
--- src/kcddrive.cpp.orig      Sun Dec 18 09:36:56 2005
2
+++ src/kcddrive.cpp   Thu Dec 15 16:49:47 2005
2
+++ src/kcddrive.cpp   Wed Jan  4 22:49:09 2006
3
@@ -27,8 +27,10 @@
3
@@ -21,6 +21,7 @@
4
 #include <sys/stat.h>
4
5
 #include <sys/ioctl.h>
5
 #include "kcddrive.h"
6
 #include <fcntl.h>
6
 #include <kprocess.h>
7
+/*
7
+#include <sys/param.h>
8
 #include <scsi/scsi.h>
8
 #include <sys/mount.h>
9
 #include <scsi/sg.h>
9
 kCDDrive::kCDDrive() {
10
+*/
10
     canReadDVD=false;
11
 #include <unistd.h>
11
@@ -55,7 +56,7 @@
12
12
       if (process->isRunning()) process->wait(-1);
13
 #include <qfile.h>
13
       delete process;
14
@@ -177,7 +179,7 @@
14
 */
15
         return 0;
15
-      umount(device.latin1());
16
     }
16
+      unmount(device.latin1(),0);
17
17
       dev->eject();
18
-    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
18
       }
19
+/*    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
19
    }
20
         close (fd);
20
@@ -99,6 +100,7 @@
21
         return 0;
21
 void kCDDrives::scanDrives() {
22
     }
22
     int i;
23
@@ -185,6 +187,7 @@
23
     drives.clear();
24
         close(fd);
24
+    dm->clear();
25
         return 0;
25
     dm->scanBus();
26
     }
26
     dm->scanFstab();
27
+*/
27
28
     id = m_idlun.mux4 & 0xFF;
29
     lun = (m_idlun.mux4 >> 8)  & 0xFF;
30
(-)k9copy/files/patch-src_kdvd.cpp Thu Jan 1 03:00:00 1970 (-34 lines)
Lines 1-34 Link Here
1
--- src/kdvd.cpp.orig  Sun Dec 18 23:50:47 2005
2
+++ src/kdvd.cpp       Mon Dec 19 00:19:47 2005
3
@@ -409,7 +409,7 @@
4
         return -1;
5
     }
6
7
-    if ( fseek(filehandle, 32808, SEEK_SET )) {
8
+    if ( fseek(filehandle, 32768, SEEK_SET )) {
9
         fclose(filehandle);
10
         c.sprintf(tr2i18n("Couldn't seek in %s for title\n"), dvd_device);
11
         setError(c);
12
@@ -417,14 +417,20 @@
13
         return -1;
14
     }
15
16
-    if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
17
+    {
18
+    #define DVD_SEC_SIZ 2048
19
+    char tempBuf[ DVD_SEC_SIZ ];
20
+    if ( DVD_SEC_SIZ != fread(tempBuf, 1, DVD_SEC_SIZ, filehandle) ) {
21
         fclose(filehandle);
22
         c=tr2i18n("Couldn't read enough bytes for title.\n");
23
         setError(c);
24
         strcpy(title, "unknown");
25
         return -1;
26
     }
27
-
28
+    snprintf( title, 32, "%s", tempBuf + 40 );
29
+    i=32;
30
+    }
31
+
32
     fclose (filehandle);
33
34
     title[32] = '\0';
(-)k9copy/files/patch-src_kifo.cpp Thu Jan 1 03:00:00 1970 (-12 lines)
Lines 1-12 Link Here
1
--- src/kifo.cpp.orig  Sun Dec 18 23:40:34 2005
2
+++ src/kifo.cpp       Sun Dec 18 23:40:52 2005
3
@@ -21,6 +21,9 @@
4
 #include <dvdread/dvd_reader.h>
5
 #include <dvdread/ifo_read.h>
6
 #include <dvdread/ifo_print.h>
7
+#ifdef __FreeBSD__
8
+#include <osreldate.h>
9
+#endif
10
 #include "bswap.h"
11
12
 #ifndef DVD_BLOCK_LEN
(-)k9copy/files/patch-vamps_Makefile.in Thu Jan 1 03:00:00 1970 (-11 lines)
Lines 1-11 Link Here
1
--- vamps/Makefile.in.orig     Tue Dec 20 15:26:47 2005
2
+++ vamps/Makefile.in  Tue Dec 20 15:30:34 2005
3
@@ -329,7 +329,7 @@
4
 xdg_directorydir = @xdg_directorydir@
5
 xdg_menudir = @xdg_menudir@
6
 #>- METASOURCES = AUTO
7
-usrbindir = /usr/bin
8
+usrbindir = ${prefix}/bin
9
 k9vamps_LDADD = -lpthread -lm
10
 k9vamps_SOURCES = requant.h vamps.cpp putvlc.h getvlc.h requant.cpp
11
 k9playcell_LDADD = -ldvdread
(-)k9copy/pkg-descr Tue Jan 3 02:53:08 2006
Lines 21-24 Link Here

Return to bug 91356