texlive-pdftex.patch

   1 --- texlive-2007/texk/web2c/pdftexdir/ptexlib.h.orig    2007-06-21 20:07:37.746531903 -0400
   2 +++ texlive-2007/texk/web2c/pdftexdir/ptexlib.h 2007-06-21 20:05:40.014606804 -0400
   3 @@ -38,7 +38,9 @@
   4  /* avl */
   5  #  include "avlstuff.h"
   6
   7 +#ifndef __linux__
   8  #  include "openbsd-compat.h"
   9 +#endif
  10
  11  /* pdftexlib type declarations */
  12  typedef struct {
  13 --- texlive-2007/texk/web2c/pdftexdir/epdf.h.orig       2007-06-21 22:27:08.039209770 -0400
  14 +++ texlive-2007/texk/web2c/pdftexdir/epdf.h    2007-06-21 22:27:32.643343920 -0400
  15 @@ -44,7 +44,9 @@
  16
  17  #include <web2c/pdftexdir/ptexmac.h>
  18
  19 +#ifndef __linux__
  20  #include "openbsd-compat.h"
  21 +#endif
  22
  23  /* #-define pdfbufsize      pdfbufmax */
  24
  25 --- texlive-2007/texk/web2c/pdftexdir/depend.mk.pdftex  2006-12-26 18:37:34.000000000 -0500
  26 +++ texlive-2007/texk/web2c/pdftexdir/depend.mk 2007-06-22 00:17:35.157351368 -0400
  27 @@ -7,15 +7,13 @@
  28   ptexmac.h
  29  utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
  30   ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
  31 - ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
  32 - ../../../libs/md5/md5.h pdftexextra.h \
  33 - ../../../libs/obsdcompat/openbsd-compat.h
  34 +pdftexextra.h
  35  vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
  36   ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
  37   ptexmac.h
  38  pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
  39   ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
  40 -writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
  41 +writefont.o: writefont.c ptexlib.h \
  42   ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
  43   ../texmfmem.h ../pdftexcoerce.h ptexmac.h
  44  writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
  45 @@ -24,7 +22,7 @@
  46   ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
  47  writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
  48   ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
  49 - ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
  50 + ptexmac.h
  51  writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
  52   ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
  53   ptexmac.h
  54 @@ -40,16 +38,7 @@
  55  writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
  56   ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
  57   ptexmac.h image.h
  58 -pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
  59 - ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
  60 - ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
  61 - ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
  62 - ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
  63 - ../../../libs/xpdf/xpdf/Error.h epdf.h
  64 +pdftoepdf.o: pdftoepdf.cc \
  65 + epdf.h
  66  ttf2afm.o: ttf2afm.c writettf.h macnames.c
  67 -pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \
  68 - ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
  69 - ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
  70 - ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
  71 - ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
  72 - ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h
  73 +pdftosrc.o: pdftosrc.cc
  74 --- texlive-2007/texk/web2c/pdftexdir/utils.c.orig      2007-06-22 00:33:15.216284121 -0400
  75 +++ texlive-2007/texk/web2c/pdftexdir/utils.c   2007-06-22 00:33:32.948057443 -0400
  76 @@ -20,7 +20,9 @@
  77  $Id$
  78  */
  79
  80 +#ifndef __linux__
  81  #include "openbsd-compat.h"
  82 +#endif
  83  #ifdef HAVE_ASPRINTF            /* asprintf is not defined in openbsd-compat.h, but in stdio.h */
  84  #  include <stdio.h>
  85  #endif