diff -rupN gtktalog-1.0.4.orig/configure.in gtktalog-1.0.4.new/configure.in
old
|
new
|
AM_PROG_LEX |
17 | 17 | AC_PROG_YACC |
18 | 18 | AC_PROG_INSTALL |
19 | 19 | AC_PROG_MAKE_SET |
| 20 | AM_PROG_MKDIR_P |
20 | 21 | #AM_PROG_LIBTOOL |
21 | 22 | |
22 | 23 | dnl Internationalization |
23 | 24 | dnl ==================== |
24 | 25 | ALL_LINGUAS="fr pl hu ja es sv ca cs nl de sk it ru pt_BR" |
25 | 26 | AM_GNU_GETTEXT([external]) |
| 27 | AM_GNU_GETTEXT_VERSION(0.18.1) |
26 | 28 | |
27 | 29 | localedir=${datadir}/locale |
28 | 30 | AC_SUBST(localedir) |
… |
… |
dnl ======================== |
50 | 52 | AC_HEADER_DIRENT |
51 | 53 | AC_HEADER_STDC |
52 | 54 | AC_HEADER_SYS_WAIT |
53 | | AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h) |
| 55 | AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h sys/mtio.h) |
54 | 56 | |
55 | 57 | dnl Checks for typedefs, structures, and compiler characteristics. |
56 | 58 | dnl ============================================================== |
diff -rupN gtktalog-1.0.4.orig/po/Makefile.in.in gtktalog-1.0.4.new/po/Makefile.in.in
old
|
new
|
VPATH = @srcdir@ |
21 | 21 | prefix = @prefix@ |
22 | 22 | exec_prefix = @exec_prefix@ |
23 | 23 | datadir = @datadir@ |
| 24 | datarootdir = @datarootdir@ |
24 | 25 | localedir = $(datadir)/locale |
25 | 26 | gettextsrcdir = $(datadir)/gettext/po |
26 | 27 | |
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/eject.c gtktalog-1.0.4.new/src/gtktalog/eject.c
old
|
new
|
|
20 | 20 | #include <gnome.h> |
21 | 21 | #include <stdio.h> |
22 | 22 | #include <sys/ioctl.h> |
| 23 | #if defined(HAVE_SYS_MTIO_H) |
23 | 24 | #include <sys/mtio.h> |
| 25 | #endif |
24 | 26 | #include <sys/types.h> |
25 | 27 | #include <linux/cdrom.h> |
26 | 28 | #include <fcntl.h> |
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/fastaddisk.c gtktalog-1.0.4.new/src/gtktalog/fastaddisk.c
old
|
new
|
|
30 | 30 | #include <signal.h> |
31 | 31 | #include <sys/stat.h> |
32 | 32 | #include <sys/wait.h> |
| 33 | #if defined(HAVE_SYS_MTIO_H) |
33 | 34 | #include <sys/mtio.h> |
| 35 | #endif |
34 | 36 | #include <fcntl.h> |
35 | 37 | #include <unistd.h> |
36 | 38 | #include <stdlib.h> |
37 | 39 | #if defined(USE_PTHREADS) |
38 | 40 | # include <pthread.h> |
39 | 41 | #endif |
40 | | #include <sys/mtio.h> |
41 | 42 | #include <fcntl.h> |
42 | 43 | #include <errno.h> |
43 | 44 | #include <unistd.h> |
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/progressbar.c gtktalog-1.0.4.new/src/gtktalog/progressbar.c
old
|
new
|
progress_needReset () |
90 | 90 | glong |
91 | 91 | getStats (char *foldername) |
92 | 92 | { |
| 93 | #if HAVE_STATFS |
93 | 94 | struct statfs statBuf; |
94 | 95 | |
95 | 96 | if (statfs (foldername, &statBuf) == -1) |
… |
… |
getStats (char *foldername) |
98 | 99 | |
99 | 100 | /* Total size of the CD in Bytes */ |
100 | 101 | return statBuf.f_blocks * statBuf.f_bsize; |
| 102 | #else |
| 103 | return -1; |
| 104 | #endif |
101 | 105 | } |
102 | 106 | |
103 | 107 | void |
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/report.c gtktalog-1.0.4.new/src/gtktalog/report.c
old
|
new
|
print_file (FILE_DATA * fd, FILE * file) |
333 | 333 | if (gb_html_report) |
334 | 334 | fprintf (file, "<TR>"); |
335 | 335 | if (gb_xml_report) |
336 | | fprintf (file, xml_directory_st); |
| 336 | fprintf (file, "%s", xml_directory_st); |
337 | 337 | if (gb_check_disks) |
338 | 338 | { |
339 | 339 | if (gb_xml_report) |
… |
… |
print_file (FILE_DATA * fd, FILE * file) |
521 | 521 | if (gb_html_report) |
522 | 522 | fprintf (file, "</TR>"); |
523 | 523 | if (gb_xml_report) |
524 | | fprintf (file, xml_directory_ed); |
| 524 | fprintf (file, "%s", xml_directory_ed); |
525 | 525 | fprintf (file, "\n"); |
526 | 526 | } |
527 | 527 | |
diff -rupN gtktalog-1.0.4.orig/src/plugins/aviinfo.cpp gtktalog-1.0.4.new/src/plugins/aviinfo.cpp
old
|
new
|
struct avi |
63 | 63 | struct avi_audio audio; |
64 | 64 | }; |
65 | 65 | |
66 | | char* version="0.1"; |
67 | | char* author="Panagiotis Issaris"; |
68 | | char* email="panagiotis.issaris@advalvas.be"; |
69 | | char* pluginname="aviinfo"; |
70 | | char* date="2000"; |
| 66 | const char* version="0.1"; |
| 67 | const char* author="Panagiotis Issaris"; |
| 68 | const char* email="panagiotis.issaris@advalvas.be"; |
| 69 | const char* pluginname="aviinfo"; |
| 70 | const char* date="2000"; |
71 | 71 | |
72 | 72 | void strtolower(char* str) |
73 | 73 | { |
diff -rupN gtktalog-1.0.4.orig/src/plugins/html.cpp gtktalog-1.0.4.new/src/plugins/html.cpp
old
|
new
|
|
19 | 19 | * * |
20 | 20 | ***************************************************************************/ |
21 | 21 | |
22 | | #include <iostream.h> |
23 | 22 | #include <stdio.h> |
24 | 23 | #include <stdlib.h> |
25 | 24 | #include <string.h> |
26 | 25 | #include <ctype.h> |
27 | 26 | |
28 | 27 | |
29 | | char* RESPONSE_END="|END|"; |
| 28 | const char* RESPONSE_END="|END|"; |
30 | 29 | |
31 | 30 | void strtolower(char* str) |
32 | 31 | { |
diff -rupN gtktalog-1.0.4.orig/src/plugins/mp3.cpp gtktalog-1.0.4.new/src/plugins/mp3.cpp
old
|
new
|
|
1 | | #include <iostream.h> |
2 | 1 | #include <stdlib.h> |
3 | 2 | #include <stdio.h> |
4 | 3 | #include "mp3tag.h" |