Ticket #28845: patch-gtktalog-changes.diff

gtktalog-1.0.4.

@@ -17 +17 @@
 AC_PROG_YACC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
+AM_PROG_MKDIR_P
 #AM_PROG_LIBTOOL
 
 dnl Internationalization
 dnl ====================
 ALL_LINGUAS="fr pl hu ja es sv ca cs nl de sk it ru pt_BR"
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.18.1)
 
 localedir=${datadir}/locale
 AC_SUBST(localedir)
@@ -50 +52 @@
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h sys/mtio.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl ==============================================================

po/Makefile.in.in

@@ -21 +21 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
+datarootdir = @datarootdir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 

src/gtktalog/eject.c

@@ -20 +20 @@
 #include <gnome.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_SYS_MTIO_H)
 #include <sys/mtio.h>
+#endif
 #include <sys/types.h>
 #include <linux/cdrom.h>
 #include <fcntl.h>

src/gtktalog/fastaddisk.c

@@ -30 +30 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#if defined(HAVE_SYS_MTIO_H)
 #include <sys/mtio.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #if defined(USE_PTHREADS)
 #    include <pthread.h>
 #endif
-#include <sys/mtio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>

src/gtktalog/progressbar.c

@@ -90 +90 @@
 glong
 getStats (char *foldername)
 {
+#if HAVE_STATFS
   struct statfs statBuf;
 
   if (statfs (foldername, &statBuf) == -1)
@@ -98 +99 @@
 
   /* Total size of the CD in Bytes */
   return statBuf.f_blocks * statBuf.f_bsize;
+#else
+  return -1;
+#endif
 }
 
 void

src/gtktalog/report.c

@@ -333 +333 @@
   if (gb_html_report)
     fprintf (file, "<TR>");
   if (gb_xml_report)
-    fprintf (file, xml_directory_st);
+    fprintf (file, "%s", xml_directory_st);
   if (gb_check_disks)
     {
       if (gb_xml_report)
@@ -521 +521 @@
   if (gb_html_report)
     fprintf (file, "</TR>");
   if (gb_xml_report)
-    fprintf (file, xml_directory_ed);
+    fprintf (file, "%s", xml_directory_ed);
   fprintf (file, "\n");
 }
 

src/plugins/aviinfo.cpp

@@ -63 +63 @@
         struct avi_audio audio;
 };
 
-char* version="0.1";
-char* author="Panagiotis Issaris";
-char* email="panagiotis.issaris@advalvas.be";
-char* pluginname="aviinfo";
-char* date="2000";
+const char* version="0.1";
+const char* author="Panagiotis Issaris";
+const char* email="panagiotis.issaris@advalvas.be";
+const char* pluginname="aviinfo";
+const char* date="2000";
 
 void strtolower(char* str)
 {

src/plugins/html.cpp

@@ -19 +19 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <iostream.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 
-char* RESPONSE_END="|END|";
+const char* RESPONSE_END="|END|";
 
 void strtolower(char* str)
 {

src/plugins/mp3.cpp

@@ -1 @@
-#include <iostream.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "mp3tag.h"