tags 667419 + pending thanks Dear maintainer,
I've prepared an NMU for xdiskusage (versioned as 1.48-10.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Joan Baez: If I where a carpenter
diff -Nru xdiskusage-1.48/debian/changelog xdiskusage-1.48/debian/changelog --- xdiskusage-1.48/debian/changelog 2010-04-04 12:16:28.000000000 +0200 +++ xdiskusage-1.48/debian/changelog 2012-05-27 14:01:35.000000000 +0200 @@ -1,3 +1,13 @@ +xdiskusage (1.48-10.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Cyril Brulebois ] + * Fix FTBFS with gcc 4.7 by avoiding redeclared variable names in + nested scopes (Closes: #667419). + + -- gregor herrmann <gre...@debian.org> Sun, 27 May 2012 14:01:23 +0200 + xdiskusage (1.48-10) unstable; urgency=low * Support disk >4.3TB from upstream cvs rev1.22 (Closes: #555323) diff -Nru xdiskusage-1.48/debian/patches/10_fix_ftbfs_with_gcc_4.7.patch xdiskusage-1.48/debian/patches/10_fix_ftbfs_with_gcc_4.7.patch --- xdiskusage-1.48/debian/patches/10_fix_ftbfs_with_gcc_4.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ xdiskusage-1.48/debian/patches/10_fix_ftbfs_with_gcc_4.7.patch 2012-05-27 14:05:24.000000000 +0200 @@ -0,0 +1,32 @@ +Description: avoid redeclared variable names in nested scopes (FTBFS with gcc 4.7) +Origin: vendor +Bug-Debian: http://bugs.debian.org/667419 +Forwarded: no +Author: Cyril Brulebois <k...@debian.org> +Reviewed-by: gregor herrmann <gre...@debian.org> +Last-Update: 2012-05-27 + +--- a/xdiskusage.C ++++ b/xdiskusage.C +@@ -405,8 +405,8 @@ OutputWindow* OutputWindow::make(const c + strncpy(pathbuf, path, 1024); + for (int i=0; i<10; i++) { + char *p = (char*)fl_filename_name(pathbuf); +- int i = readlink(pathbuf, p, 1024-(p-pathbuf)); +- if (i < 0) { ++ int r = readlink(pathbuf, p, 1024-(p-pathbuf)); ++ if (r < 0) { + if (errno != EINVAL) { + strcat(pathbuf, ": no such file"); + fl_alert(pathbuf); +@@ -414,8 +414,8 @@ OutputWindow* OutputWindow::make(const c + } + break; + } +- if (*p == '/') {memmove(pathbuf, p, i); p = pathbuf;} +- p[i] = 0; ++ if (*p == '/') {memmove(pathbuf, p, r); p = pathbuf;} ++ p[r] = 0; + path = pathbuf; + } + } diff -Nru xdiskusage-1.48/debian/patches/series xdiskusage-1.48/debian/patches/series --- xdiskusage-1.48/debian/patches/series 2010-04-03 20:01:03.000000000 +0200 +++ xdiskusage-1.48/debian/patches/series 2012-05-27 14:01:20.000000000 +0200 @@ -4,3 +4,4 @@ 04_xdiskusage.C_check_standard_input.patch 05_xdiskusage.C_support_4.3TB_and_more.patch 06_xdiskusage.C_used_Ki_Mi_Gi.patch +10_fix_ftbfs_with_gcc_4.7.patch
signature.asc
Description: Digital signature
