tags 461722 + patch thanks The attached patch does the necessary magic to make the package build with GCC 4.3.
HTH. Kumar -- Kumar Appaiah, 458, Jamuna Hostel, Indian Institute of Technology Madras, Chennai - 600 036
diff -u wordtrans-1.1pre15/src/qconfig/appconf.cpp wordtrans-1.1pre15/src/qconfig/appconf.cpp --- wordtrans-1.1pre15/src/qconfig/appconf.cpp +++ wordtrans-1.1pre15/src/qconfig/appconf.cpp @@ -71,8 +71,8 @@ #include <fcntl.h> #include <sys/types.h> -#include <fstream.h> -#include <string.h> +#include <fstream> +#include <cstring> #include <ctype.h> #include <stdio.h> #include <stdlib.h> diff -u wordtrans-1.1pre15/src/qconfig/appconf.h wordtrans-1.1pre15/src/qconfig/appconf.h --- wordtrans-1.1pre15/src/qconfig/appconf.h +++ wordtrans-1.1pre15/src/qconfig/appconf.h @@ -106,9 +106,11 @@ # include <config.h> #endif -#include <iostream.h> +#include <iostream> #include <stdlib.h> +using namespace std; + // make sure we have a Bool type // Change by Ricardo Villalba. Bool = bool (not int). #define Bool bool diff -u wordtrans-1.1pre15/debian/TODO.Debian wordtrans-1.1pre15/debian/TODO.Debian --- wordtrans-1.1pre15/debian/TODO.Debian +++ wordtrans-1.1pre15/debian/TODO.Debian @@ -2,7 +2,7 @@ - Fix the sources in src/qconfig/ in order to use proper g++ 3.3 headers (to avoid warnings and potential issues) Note: it seems to not be able to find the declarations if -<iostream> is used instead of <iostream.h> it has to be investigated +<iostream> is used instead of <iostream> it has to be investigated further. - Consider providing the dictionaries (text files and babylon files) --- wordtrans-1.1pre15.orig/src/qconfig/SimpleConfig.cpp +++ wordtrans-1.1pre15/src/qconfig/SimpleConfig.cpp @@ -3,7 +3,7 @@ #include <SimpleConfig.h> #include <stdlib.h> -#include <fstream.h> +#include <fstream> #include <cstring> //Soluciona el bug #113819 de Debian #include "../salidas.h" //¡Añade dependencia a un fichero externo! only in patch2: unchanged: --- wordtrans-1.1pre15.orig/src/libbab/libbab.cc +++ wordtrans-1.1pre15/src/libbab/libbab.cc @@ -30,6 +30,9 @@ #include <list> #include <cctype> #include <cerrno> +#include <cstring> + +using namespace std; #ifdef HONOR_STD using std::istream ; only in patch2: unchanged: --- wordtrans-1.1pre15.orig/src/no-gui.cpp +++ wordtrans-1.1pre15/src/no-gui.cpp @@ -27,6 +27,7 @@ #include "salidas.h" #include <qtextcodec.h> #include "version.h" +#include <cstring> #define BUSCAR 1 #define SHOW_DESC 2 only in patch2: unchanged: --- wordtrans-1.1pre15.orig/src/libidp.cpp +++ wordtrans-1.1pre15/src/libidp.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "libidp.h" -#include <iostream.h> +#include <iostream> #include <stdio.h> string conv_idp="a/áe/éi/ío/óu/úa\\àe\\èi\\ìo\\òu\\ùn~ña.äe.ëi.ïo.öu.ü" only in patch2: unchanged: --- wordtrans-1.1pre15.orig/src/idp2text.cpp +++ wordtrans-1.1pre15/src/idp2text.cpp @@ -19,7 +19,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include <stdlib.h> #include <string> #include <stdio.h>
signature.asc
Description: Digital signature
