tags 413416 + patch thanks Hi,
Attached is the diff for my konwert 1.8-11.1 NMU.
diff -u konwert-1.8/bin/trs.cc konwert-1.8/bin/trs.cc --- konwert-1.8/bin/trs.cc +++ konwert-1.8/bin/trs.cc @@ -8,8 +8,8 @@ // ^^ http://qrczak.home.ml.org/ #include <string.h> -#include <iostream.h> -#include <fstream.h> +#include <iostream> +#include <fstream> #include <sstream> #include <ctype.h> #include <unistd.h> diff -u konwert-1.8/bin/filterm.cc konwert-1.8/bin/filterm.cc --- konwert-1.8/bin/filterm.cc +++ konwert-1.8/bin/filterm.cc @@ -1,4 +1,5 @@ -#include <iostream.h> +#include <iostream> +#include <limits.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> @@ -23,7 +24,7 @@ void uzycie (int status) { - (status ? cerr : cout) << "\ + (status ? std::cerr : std::cout) << "\ Usage: " << nazwaprogramu << " INPUT OUTPUT [COMMAND [ARGS]]\n\ Execute the specified COMMAND (default is the shell), filtering terminal\n\ input and/or output.\n\ @@ -47,7 +48,7 @@ void wersja() { - cout << "\ + std::cout << "\ filterm, version " WERSJA "\n\ Copyright 1998 Marcin Kowalczyk <[EMAIL PROTECTED]>\n\ "; @@ -69,7 +70,7 @@ int r; r = getpty(); if (r==-1) { - cerr << "Error opening pty\n"; + std::cerr << "Error opening pty\n"; exit (1); } diff -u konwert-1.8/debian/changelog konwert-1.8/debian/changelog --- konwert-1.8/debian/changelog +++ konwert-1.8/debian/changelog @@ -1,3 +1,10 @@ +konwert (1.8-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 4.3 (Closes: #413416). + + -- Luk Claes <[EMAIL PROTECTED]> Fri, 07 Mar 2008 18:54:25 +0000 + konwert (1.8-11) unstable; urgency=low * Switch from debhelper v1 mode to v5: only in patch2: unchanged: --- konwert-1.8.orig/bin/512bold.cc +++ konwert-1.8/bin/512bold.cc @@ -1,6 +1,6 @@ #include <stdlib.h> -#include <iostream.h> +#include <iostream> #define NPAR 16 @@ -83,7 +83,7 @@ for (int i = 0; i < 8; i++) if (zmien[i]) { - cout << "\33]P" << hex[i] << normalny[nastare[i]]; + std::cout << "\33]P" << hex[i] << normalny[nastare[i]]; zmien[i] = 0; } zmiencos = 0; @@ -93,7 +93,7 @@ { int attr = color; if (reverse) attr = (attr & 0x88) | (((attr >> 4) | (attr << 4)) & 0x77); - cout << 30 + kolory + std::cout << 30 + kolory ( (underline ? ulcolor : intensity == 0 ? halfcolor : @@ -141,7 +141,7 @@ switch (par[i]) { case 0: /* all attributes off */ - cout << "0;"; + std::cout << "0;"; default_attr(); update_attr(); break; @@ -200,9 +200,9 @@ update_attr(); } else - cout << par[i]; + std::cout << par[i]; } - if (i != npar) cout << ';'; + if (i != npar) std::cout << ';'; } npar = -1; } @@ -218,7 +218,7 @@ if (underline) { update_attr(); - cout << "m\33["; + std::cout << "m\33["; } } break; @@ -229,7 +229,7 @@ if (intensity == 0) { update_attr(); - cout << "m\33["; + std::cout << "m\33["; } } break; @@ -240,21 +240,21 @@ intensity == 0 ? halfcolor : (color & 0x0F)) ^ (intensity == 2) * 8 ) | (color & 0xF0); - cout << 30 + (def_color & 0x07) << ';' << 40 + (def_color >> 4); - if (def_color & 0x08) cout << ";1"; - cout << "m\33[8]\33["; - if (def_color & 0x08) cout << "22;"; + std::cout << 30 + (def_color & 0x07) << ';' << 40 + (def_color >> 4); + if (def_color & 0x08) std::cout << ";1"; + std::cout << "m\33[8]\33["; + if (def_color & 0x08) std::cout << "22;"; default_attr(); update_attr(); - cout << 'm'; + std::cout << 'm'; return; } for (int i = 0; i <= npar; i++) { - cout << par[i]; - if (i < npar) cout << ';'; + std::cout << par[i]; + if (i < npar) std::cout << ';'; } - cout << ']'; + std::cout << ']'; } void con_write (unsigned char c) @@ -292,7 +292,7 @@ save_cur(); break; case '8': - cout << "8\33["; + std::cout << "8\33["; restore_cur(); c = 'm'; break; @@ -341,13 +341,13 @@ } for (int i = 0; i <= npar; i++) { - cout << par[i]; - if (i < npar) cout << ';'; + std::cout << par[i]; + if (i < npar) std::cout << ';'; } } } } - cout << c; + std::cout << c; if (zmiencos) update_pal(); } @@ -383,9 +383,9 @@ { licz_odleglosci(); reset_terminal(); - cout << "\30\33]R\33[0;"; update_attr(); cout << "m"; + std::cout << "\30\33]R\33[0;"; update_attr(); std::cout << "m"; update_pal(); int c; - while ((c = cin.get()) != -1) con_write (c); - cout << "\30\33]R\33[0m"; + while ((c = std::cin.get()) != -1) con_write (c); + std::cout << "\30\33]R\33[0m"; } only in patch2: unchanged: --- konwert-1.8.orig/bin/512bold1.cc +++ konwert-1.8/bin/512bold1.cc @@ -1,5 +1,5 @@ -#include <iostream.h> +#include <iostream> int kolory[2][8] = { { 0, 1, 2, 1, 4, 1, 2, 7 }, { 0, 5, 6, 6, 5, 5, 6, 3 } }; @@ -15,7 +15,7 @@ void update_attr() { - cout << 30 + (underline ? ulcolor : intensity == 0 ? halfcolor : + std::cout << 30 + (underline ? ulcolor : intensity == 0 ? halfcolor : kolory[intensity == 2][color & 0x0F]) << ';' << 40 + kolory[0][color >> 4]; } @@ -54,7 +54,7 @@ switch (par[i]) { case 0: /* all attributes off */ - cout << "0;"; + std::cout << "0;"; default_attr(); update_attr(); break; @@ -105,9 +105,9 @@ update_attr(); } else - cout << par[i]; + std::cout << par[i]; } - if (i != npar) cout << ';'; + if (i != npar) std::cout << ';'; } npar = -1; } @@ -191,25 +191,25 @@ } for (int i = 0; i <= npar; i++) { - cout << par[i]; - if (i < npar) cout << ';'; + std::cout << par[i]; + if (i < npar) std::cout << ';'; } } } } - cout << c; + std::cout << c; } main() { reset_terminal(); - cout << "\33]P0000000\33]P1AA0000\33]P200AA00\33]P3FFFFFF" + std::cout << "\33]P0000000\33]P1AA0000\33]P200AA00\33]P3FFFFFF" "\33]P40000AA\33]P5FF55FF\33]P655FFFF\33]P7AAAAAA" "\33]P8000000\33]P9AA0000\33]PA00AA00\33]PBFFFFFF" "\33]PC0000AA\33]PDFF55FF\33]PE55FFFF\33]PFAAAAAA" "\33[0;"; - update_attr(); cout << "m"; + update_attr(); std::cout << "m"; int c; - while ((c = cin.get()) != -1) con_write (c); - cout << "\33]R\33[0m"; + while ((c = std::cin.get()) != -1) con_write (c); + std::cout << "\33]R\33[0m"; }
