I have re-done the patch for GCC-4.0. Unless there are any
objections, or you intend to upload a fix yourself, I intend to upload
this shortly.
Longer-term, you might want to convert the source to ANSI C.
Nowadays, K&R C is rather behind the times. Because of this, there
are a number of warnings in the tools directory that really do need
investigating (but are not RC).
Regards,
Roger
diff -urN dvi2ps-3.2j.original/debian/changelog dvi2ps-3.2j/debian/changelog
--- dvi2ps-3.2j.original/debian/changelog 2005-07-20 21:19:30.152077328
+0100
+++ dvi2ps-3.2j/debian/changelog 2005-07-20 21:25:55.744458376 +0100
@@ -1,3 +1,15 @@
+dvi2ps (3.2j-10.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules: Build with CCFLAGS='-g -O -DPOSIX -DSYSV -DANSI'.
+ This allows building with GCC 4.0 (Closes: #298177).
+ * ftfont.c: pid and eid should be "unsigned short", in order to
+ match the prototype of FreeType TT_Get_CharMap_ID().
+ * tools/nup.c, tools/texfix.c: Add standard headers where
+ required, and correct a buggy use of a preprocessor conditional.
+
+ -- Roger Leigh <[EMAIL PROTECTED]> Wed, 20 Jul 2005 21:21:38 +0100
+
dvi2ps (3.2j-10) unstable; urgency=low
* Add Spanish po-debconf templates. (Closes: #307690).
diff -urN dvi2ps-3.2j.original/debian/rules dvi2ps-3.2j/debian/rules
--- dvi2ps-3.2j.original/debian/rules 2005-07-20 21:19:30.152077328 +0100
+++ dvi2ps-3.2j/debian/rules 2005-07-20 20:53:23.998136712 +0100
@@ -40,8 +40,8 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) PREFIX=/usr MFMODE=ljfour
- $(MAKE) lprdvi newlib
+ $(MAKE) PREFIX=/usr MFMODE=ljfour CCFLAGS='-g -O -DPOSIX -DSYSV -DANSI'
+ $(MAKE) lprdvi newlib CCFLAGS='-g -O -DPOSIX -DSYSV -DANSI'
(cd tools ; $(MAKE) -f ../debian/Makefile.tools)
find lib -type d -name 'CVS' |xargs rm -rf
diff -urN dvi2ps-3.2j.original/ftfont.c dvi2ps-3.2j/ftfont.c
--- dvi2ps-3.2j.original/ftfont.c 2000-03-02 15:22:19.000000000 +0000
+++ dvi2ps-3.2j/ftfont.c 2005-07-20 21:20:25.509661696 +0100
@@ -208,7 +208,7 @@
void read_tfm_finfo();
BOOLEAN raster;
int cmcount, cmid;
- short pid, eid;
+ unsigned short pid, eid;
unsigned char remap[NTFMCHARS];
int tfmw;
int nwidth, nheight, nxoff, ndepth;
@@ -451,7 +451,7 @@
char *fn, *filename;
BOOLEAN raster;
int cmcount, cmid;
- short pid, eid;
+ unsigned short pid, eid;
char enc;
int (*codeconv)();
int nwidth, nheight, nxoff, ndepth;
diff -urN dvi2ps-3.2j.original/tools/nup.c dvi2ps-3.2j/tools/nup.c
--- dvi2ps-3.2j.original/tools/nup.c 1999-11-02 16:55:47.000000000 +0000
+++ dvi2ps-3.2j/tools/nup.c 2005-07-20 21:04:14.473249464 +0100
@@ -9,7 +9,9 @@
*/
#define version "1.4"
+#include <ctype.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#define TRUE 1
diff -urN dvi2ps-3.2j.original/tools/texfix.c dvi2ps-3.2j/tools/texfix.c
--- dvi2ps-3.2j.original/tools/texfix.c 1992-09-25 04:35:18.000000000 +0100
+++ dvi2ps-3.2j/tools/texfix.c 2005-07-20 21:20:25.571652272 +0100
@@ -7,8 +7,10 @@
* This original program is "retexps" made by [EMAIL PROTECTED]
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <unistd.h>
char *mktemp();
#ifdef STRSTR
@@ -19,7 +21,7 @@
#define BSP "@beginspecial\n"
#define ESP "@endspecial\n"
-#ifdef JDVI2KPS || JDVI2KPS2
+#if defined(JDVI2KPS) || defined(JDVI2KPS2)
#define BOP "@bop0\n"
#define EOP "@eop\n"
#else
--
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.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
