Bug#285646: dvi2dvi: FTBFS (amd64/gcc-4.0): conflicting types for 'sprintf'

[Roger Leigh]

On Wed, Jul 20, 2005 at 07:28:32PM +0100, Roger Leigh wrote:
> Hi,
> 
> Unless there are any objections, I intend to NMU dvi2dvi to fix the
> GCC 4.0 FTBFS bug.  The diff of the changes follows.

A slightly improved diff follows.  This eliminates the defs.h
patch.


Regards,
Roger


-- 
Roger Leigh
                Printing on GNU/Linux?  http://gimp-print.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.

diff -urN dvi2dvi-2.0alpha.original/debian/changelog 
dvi2dvi-2.0alpha/debian/changelog
--- dvi2dvi-2.0alpha.original/debian/changelog  2005-07-20 19:10:01.000000000 
+0100
+++ dvi2dvi-2.0alpha/debian/changelog   2005-07-20 19:41:35.793544544 +0100
@@ -1,3 +1,14 @@
+dvi2dvi (2.0alpha-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules: Add "-DSYSV -DANSI" to CCFLAGS when building, to fix
+    GCC 4.0 build errors due to old K&R C syntax (Closes: #285646).
+  * decompfont.c, fontdesc.c: Cast "unsigned char *" to "char *" to
+    eliminate a number of compiler warnings when performing string
+    operations on the "byte" data type.
+
+ -- Roger Leigh <[EMAIL PROTECTED]>  Wed, 20 Jul 2005 19:40:53 +0100
+
 dvi2dvi (2.0alpha-5) unstable; urgency=low
 
   * Fixed a build problem with gcc-3.4, thanks Andreas - closes: #258629
diff -urN dvi2dvi-2.0alpha.original/debian/rules dvi2dvi-2.0alpha/debian/rules
--- dvi2dvi-2.0alpha.original/debian/rules      2005-07-20 19:10:01.000000000 
+0100
+++ dvi2dvi-2.0alpha/debian/rules       2005-07-20 19:40:48.538728368 +0100
@@ -21,7 +21,7 @@
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE)
+       $(MAKE) CCFLAGS='-O -DPOSIX -DSYSV -DANSI'
        $(MAKE) newlib
        #/usr/bin/docbook-to-man debian/dvi2dvi.sgml > dvi2dvi.1
 
diff -urN dvi2dvi-2.0alpha.original/decompfont.c dvi2dvi-2.0alpha/decompfont.c
--- dvi2dvi-2.0alpha.original/decompfont.c      1996-05-03 08:05:13.000000000 
+0100
+++ dvi2dvi-2.0alpha/decompfont.c       2005-07-20 19:22:54.551661784 +0100
@@ -93,8 +93,8 @@
     ntail = fe->n+strlen(ffdcmp->dcmp_name);
     fontidx = NULL;
     for (i = 1; i <= NJSUBS; i++) {
-       (void)sprintf(n, "%s%s%s", ffdcmp->dcmp_name, jsubfontname(i), ntail);
-       readfontdef(i, 0, fe->s, fe->d, 0, strlen(n), (char *)n, &fontidx);
+       (void)sprintf((char *)n, "%s%s%s", ffdcmp->dcmp_name, jsubfontname(i), 
ntail);
+       readfontdef(i, 0, fe->s, fe->d, 0, strlen((char *)n), (char *)n, 
&fontidx);
        ffdcmp->dcmp_fetab[i] = fontidx->fent;
     }
     fe->fnt_markchar = dcmpntt_markchar;
@@ -191,9 +191,9 @@
     ntail = fe->n+strlen(ffdcmp->dcmp_name);
     fontidx = NULL;
     for (i = 1; i <= NCSUBS; i++) {
-       (void)sprintf(n, "%s%c%02x%c%s",
+       (void)sprintf((char *)n, "%s%c%02x%c%s",
                      ffdcmp->dcmp_name, CSUB_SEP, 31+i*2, CSUB_SEP, ntail);
-       readfontdef(i, 0, fe->s, fe->d, 0, strlen(n), (char *)n, &fontidx);
+       readfontdef(i, 0, fe->s, fe->d, 0, strlen((char *)n), (char *)n, 
&fontidx);
        ffdcmp->dcmp_fetab[i] = fontidx->fent;
     }
     fe->fnt_markchar = dcmpdcd_markchar;
diff -urN dvi2dvi-2.0alpha.original/fontdesc.c dvi2dvi-2.0alpha/fontdesc.c
--- dvi2dvi-2.0alpha.original/fontdesc.c        2000-06-04 16:48:30.000000000 
+0100
+++ dvi2dvi-2.0alpha/fontdesc.c 2005-07-20 19:22:54.552661632 +0100
@@ -800,7 +800,7 @@
        n = inttob(k, len); \
        off -= n+1; \
        ds_buf[off] = XXX1+len/256; \
-       strncpy(ds_buf+off+1, k, n); \
+       strncpy(ds_buf+off+1, (char *) k, n); \
        ds_p = ds_buf+off; \
        ds_len = 1+n+len;