Attachment #61790 for bug #92536

Lines 1-3 Link Here

(-)k9copy/distinfo Mon Jan 30 12:01:11 2006 (-3 / +3 lines)
1	MD5 (k9copy-1.0.2.tar.gz) = 9037dfa804a6f758c5df7e641c67127d	1	MD5 (k9copy-1.0.3.tar.gz) = 4ba308eb696c2b3c66df65e341e84ee5
2	SHA256 (k9copy-1.0.2.tar.gz) = 1432c327ea38aeaffcfe34c99637ec90b09e31552c132a947a0a0f9e36dfa9e2	2	SHA256 (k9copy-1.0.3.tar.gz) = 50f8a52fbc767e3bc8f25841eba87135854459c3eae118a96d12e184f955da0d
3	SIZE (k9copy-1.0.2.tar.gz) = 1154768	3	SIZE (k9copy-1.0.3.tar.gz) = 1048825




--- libk9copy/k9backupdlg.cpp.orig     Thu Jan  5 06:08:21 2006
+++ libk9copy/k9backupdlg.cpp  Thu Jan  5 06:08:38 2006
@@ -18,7 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/

-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif
 #include <qtimer.h>
 #include <qdatetime.h>
 #include <qapplication.h>




--- libk9copy/k9cell.h.orig    Thu Jan  5 06:09:52 2006
+++ libk9copy/k9cell.h Thu Jan  5 06:10:12 2006
@@ -22,7 +22,11 @@

 #include <qobject.h>
 #include <qobjectlist.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif
 #include "k9dvdtitle.h"
 enum streamType_t {stAudio,stVideo,stSubpicture,stOther};
 /**




--- libk9copy/k9cellcopylist.h.orig    Thu Jan  5 06:10:57 2006
+++ libk9copy/k9cellcopylist.h Thu Jan  5 06:11:13 2006
@@ -24,7 +24,11 @@
 #include "k9dvd.h"
 #include "k9cell.h"
 #include <dvdread/ifo_types.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif

 class k9CellCopyVTS {
 private:




--- libk9copy/k9dvd.cpp.orig   Mon Jan 16 10:40:01 2006
+++ libk9copy/k9dvd.cpp        Mon Jan 16 10:40:33 2006
@@ -199,7 +199,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif

 #include "k9dvd.h"
 #include "k9dvdtitle.h"
@@ -196,7 +200,7 @@
         return -1;
     }

-    if ( fseek(filehandle, 32808, SEEK_SET )) {
+    if ( fseek(filehandle, 32768, SEEK_SET )) {
         fclose(filehandle);
         c=i18n("Couldn't seek in %1 for title\n").arg( dvd_device);
         setError(c);
@@ -207,12 +207,19 @@
         return -1;
     }

-    if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
+    {
+    #define DVD_SEC_SIZ 2048

+    }
+    snprintf( title, 32, "%s", tempBuf + 40 );
+    i=32;
+
     }

     fclose (filehandle);




--- libk9copy/k9dvd.h.orig     Thu Jan  5 06:13:32 2006
+++ libk9copy/k9dvd.h  Thu Jan  5 06:13:58 2006
@@ -25,7 +25,11 @@
 #include <qobjectlist.h>
 #include <qdatetime.h>
 #include <qvaluelist.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif
 #include <dvdread/ifo_types.h>






--- libk9copy/k9dvdbackup.h.orig       Thu Jan  5 06:16:05 2006
+++ libk9copy/k9dvdbackup.h    Thu Jan  5 06:16:20 2006
@@ -26,7 +26,11 @@
 #include <qobjectlist.h>
 #include "k9cell.h"
 #include <dvdread/ifo_types.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif
 #include "k9cellcopylist.h"
 /**
 @author Jean-Michel Petit




--- libk9copy/k9dvdtitle.cpp.orig      Thu Jan  5 06:16:57 2006
+++ libk9copy/k9dvdtitle.cpp   Thu Jan  5 06:17:14 2006
@@ -31,7 +31,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <qvaluelist.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif


 //*******************k9DVDAudioStream**************




--- libk9copy/k9ifo.cpp.orig  Sun Dec 18 23:40:34 2005
+++ libk9copy/k9ifo.cpp       Sun Dec 18 23:40:52 2005
@@ -21,6 +21,9 @@
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_read.h>
 #include <dvdread/ifo_print.h>
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
 #include "bswap.h"

 #ifndef DVD_BLOCK_LEN

Lines 1-11 Link Here

(-)k9copy/files/patch-src_Makefile.in Thu Jan 1 03:00:00 1970 (-11 lines)
1	--- src/Makefile.in.orig Tue Jan 3 04:57:30 2006
2	+++ src/Makefile.in Tue Jan 3 04:57:42 2006
3	@@ -439,7 +439,7 @@
4	shellrcdir = $(kde_datadir)/k9copy
5	shellrc_DATA = k9copyui.rc
6	applnkApplication_DATA = K9copy.desktop
7	-applnkApplicationdir = $(kde_appsdir)/Application
8	+applnkApplicationdir = $(kde_appsdir)/Multimedia
9	AM_CXXFLAGS = -O2 -g3
10	#>- all: all-am
11	#>+ 1




--- src/kburndvd.cpp.orig      Thu Jan  5 06:04:49 2006
+++ src/kburndvd.cpp   Thu Jan  5 06:05:18 2006
@@ -24,7 +24,11 @@
 #include <qdir.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+       #include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+       #include <inttypes.h>
+#endif
 #include <kfiledialog.h>

 kBurnDVD::kBurnDVD()




--- 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
+}




include/k9backupdlg.h
include/k9cell.h
include/k9cellcopylist.h
include/k9common.h
include/k9dvd.h
include/k9dvdauthor.h
include/k9dvdbackup.h
include/k9dvdprogress.h
include/k9dvdsize.h
include/k9dvdtitle.h
include/k9ifo.h
lib/libk9copy.la
lib/libk9copy.so
lib/libk9copy.so.0
share/applnk/Multimedia/k9copy.desktop
share/apps/k9copy/k9copyui.rc
%%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
%%PORTDOCS%%%%DOCSDIR%%/index.docbook

share/icons/hicolor/32x32/apps/k9copy.png
share/icons/hicolor/48x48/apps/k9copy.png
share/locale/cs/LC_MESSAGES/k9copy.mo
share/locale/de/LC_MESSAGES/k9copy.mo
share/locale/el/LC_MESSAGES/k9copy.mo
share/locale/en_GB/LC_MESSAGES/k9copy.mo
share/locale/es/LC_MESSAGES/k9copy.mo
share/locale/fr/LC_MESSAGES/k9copy.mo
share/locale/hu/LC_MESSAGES/k9copy.mo
share/locale/it/LC_MESSAGES/k9copy.mo
share/locale/pt_BR/LC_MESSAGES/k9copy.mo
share/locale/ru/LC_MESSAGES/k9copy.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/apps/k9copy

Return to bug 92536

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9backupdlg.cpp Thu Jan 1 03:00:00 1970 (-15 lines)
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>

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9cell.h Thu Jan 1 03:00:00 1970 (-15 lines)
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	/**

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9cellcopylist.h Thu Jan 1 03:00:00 1970 (-15 lines)
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:

Lines 1-31 Link Here

(-)k9copy/files/patch-libk9copy_k9dvd.cpp Mon Jan 16 10:41:46 2006 (-21 / +9 lines)
1	--- libk9copy/k9dvd.cpp.orig Fri Dec 9 19:18:03 2005	1	--- libk9copy/k9dvd.cpp.orig Mon Jan 16 10:40:01 2006
2	+++ libk9copy/k9dvd.cpp Thu Jan 5 06:12:30 2006	2	+++ libk9copy/k9dvd.cpp Mon Jan 16 10:40:33 2006
3	@@ -27,7 +27,11 @@	3	@@ -199,7 +199,7 @@
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;	4	return -1;
18	}	5	}
19		6
20	- if ( fseek(filehandle, 32808, SEEK_SET )) {	7	- if ( fseek(filehandle, 32808, SEEK_SET )) {
21	+ if ( fseek(filehandle, 32768, SEEK_SET )) {	8	+ if ( fseek(filehandle, 32768, SEEK_SET )) {
22	fclose(filehandle);	9	fclose(filehandle);
23	c.sprintf(tr2i18n("Couldn't seek in %s for title\n"), dvd_device);	10	c=i18n("Couldn't seek in %1 for title\n").arg( dvd_device);
24	setError(c);	11	setError(c);
25	@@ -204,12 +208,18 @@	12	@@ -207,12 +207,19 @@
26	return -1;	13	return -1;
27	}	14	}
28		15
29	- if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {	16	- if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
30	+ {	17	+ {
31	+ #define DVD_SEC_SIZ 2048	18	+ #define DVD_SEC_SIZ 2048
Lines 39-44 Link Here
39	+ }	26	+ }
40	+ snprintf( title, 32, "%s", tempBuf + 40 );	27	+ snprintf( title, 32, "%s", tempBuf + 40 );
41	+ i=32;	28	+ i=32;
		29	+
42	}	30	}
43		31
44	fclose (filehandle);	32	fclose (filehandle);

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9dvd.h Thu Jan 1 03:00:00 1970 (-15 lines)
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

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9dvdbackup.h Thu Jan 1 03:00:00 1970 (-15 lines)
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

Lines 1-15 Link Here

(-)k9copy/files/patch-libk9copy_k9dvdtitle.cpp Thu Jan 1 03:00:00 1970 (-15 lines)
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************

Lines 1-12 Link Here

(-)k9copy/files/patch-libk9copy_k9ifo.cpp Thu Jan 1 03:00:00 1970 (-12 lines)
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

Lines 1-15 Link Here

(-)k9copy/files/patch-src_kburndvd.cpp Thu Jan 1 03:00:00 1970 (-15 lines)
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()

Lines 1-34 Link Here

(-)k9copy/files/patch-src_kcddrive.cpp Thu Jan 1 03:00:00 1970 (-34 lines)
1	--- src/kcddrive.cpp.orig Sun Dec 18 18:36:56 2005
2	+++ src/kcddrive.cpp Fri Jan 6 18:01:33 2006
3	@@ -21,6 +21,7 @@
4
5	#include "kcddrive.h"
6	#include <kprocess.h>
7	+#include <sys/param.h>
8	#include <sys/mount.h>
9	kCDDrive::kCDDrive() {
10	canReadDVD=false;
11	@@ -55,7 +56,7 @@
12	if (process->isRunning()) process->wait(-1);
13	delete process;
14	*/
15	- umount(device.latin1());
16	+ unmount(device.latin1(),0);
17	dev->eject();
18	}
19	}
20	@@ -99,6 +100,7 @@
21	void kCDDrives::scanDrives() {
22	int i;
23	drives.clear();
24	+ dm->clear();
25	dm->scanBus();
26	dm->scanFstab();
27
28	@@ -128,4 +130,4 @@
29	/** No descriptions */
30	kCDDrive * kCDDrives::getDrive(int num) {
31	return (kCDDrive *)drives.at(num);
32	-}
33	\ No newline at end of file
34	+}

Lines 2-17 Link Here

(-)k9copy/pkg-plist Mon Jan 30 12:36:21 2006 (-2 / +6 lines)
2	include/k9backupdlg.h	2	include/k9backupdlg.h
3	include/k9cell.h	3	include/k9cell.h
4	include/k9cellcopylist.h	4	include/k9cellcopylist.h
		5	include/k9common.h
5	include/k9dvd.h	6	include/k9dvd.h
6	include/k9dvdauthor.h	7	include/k9dvdauthor.h
7	include/k9dvdbackup.h	8	include/k9dvdbackup.h
8	include/k9dvdprogress.h	9	include/k9dvdprogress.h
		10	include/k9dvdsize.h
9	include/k9dvdtitle.h	11	include/k9dvdtitle.h
10	include/k9ifo.h	12	include/k9ifo.h
11	lib/libk9copy.la	13	lib/libk9copy.la
12	lib/libk9copy.so	14	lib/libk9copy.so
13	lib/libk9copy.so.0	15	lib/libk9copy.so.0
14	share/applnk/Multimedia/K9copy.desktop	16	share/applnk/Multimedia/k9copy.desktop
15	share/apps/k9copy/k9copyui.rc	17	share/apps/k9copy/k9copyui.rc
16	%%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2	18	%%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
17	%%PORTDOCS%%%%DOCSDIR%%/index.docbook	19	%%PORTDOCS%%%%DOCSDIR%%/index.docbook
Lines 20-30 Link Here
20	share/icons/hicolor/32x32/apps/k9copy.png	22	share/icons/hicolor/32x32/apps/k9copy.png
21	share/icons/hicolor/48x48/apps/k9copy.png	23	share/icons/hicolor/48x48/apps/k9copy.png
22	share/locale/cs/LC_MESSAGES/k9copy.mo	24	share/locale/cs/LC_MESSAGES/k9copy.mo
		25	share/locale/de/LC_MESSAGES/k9copy.mo
		26	share/locale/el/LC_MESSAGES/k9copy.mo
23	share/locale/en_GB/LC_MESSAGES/k9copy.mo	27	share/locale/en_GB/LC_MESSAGES/k9copy.mo
24	share/locale/es/LC_MESSAGES/k9copy.mo	28	share/locale/es/LC_MESSAGES/k9copy.mo
25	share/locale/fr/LC_MESSAGES/k9copy.mo	29	share/locale/fr/LC_MESSAGES/k9copy.mo
26	share/locale/hu/LC_MESSAGES/k9copy.mo
27	share/locale/it/LC_MESSAGES/k9copy.mo	30	share/locale/it/LC_MESSAGES/k9copy.mo
28	share/locale/pt_BR/LC_MESSAGES/k9copy.mo	31	share/locale/pt_BR/LC_MESSAGES/k9copy.mo
		32	share/locale/ru/LC_MESSAGES/k9copy.mo
29	%%PORTDOCS%%@dirrm %%DOCSDIR%%	33	%%PORTDOCS%%@dirrm %%DOCSDIR%%
30	@dirrm share/apps/k9copy	34	@dirrm share/apps/k9copy