[Reproducible-commits] [texlive-bin] 79/400: new upstream snapshot from tlpretest, remove outdated/unneeded patches
Maria Valentina Marin Rodrigues
akira-guest at moszumanska.debian.org
Thu Jul 9 21:39:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
akira-guest pushed a commit to branch master
in repository texlive-bin.
commit 33b1531215a93543434419e5149d61c84e83eee3
Author: Norbert Preining <preining at debian.org>
Date: Mon May 14 00:48:53 2012 +0000
new upstream snapshot from tlpretest, remove outdated/unneeded patches
---
debian/changelog | 8 +
debian/patches/12c_fix_pdfcrop_invocation | 19 -
debian/patches/17_texdoc | 33 --
debian/patches/30_libpoppler_0.10 | 513 ---------------------
debian/patches/30_libpoppler_0.4.5 | 440 ------------------
debian/patches/30_libpoppler_0.5.9 | 454 ------------------
debian/patches/52_feynmf-perl-sec-fix | 31 --
debian/patches/56_updmap_deb | 143 ------
debian/patches/73_tex_segfault | 22 -
debian/patches/cve-2010-0739.patch | 17 -
debian/patches/cve-2010-0827.patch | 28 --
debian/patches/cve-2010-1440 | 43 --
debian/patches/detex-hurd.diff | 22 -
debian/patches/dvipdfmx-config-i-directive | 42 --
debian/patches/fix-mpost-segfault | 17 -
debian/patches/fmtutil-fix-infinite-loop_upstream | 30 --
debian/patches/icu-xetex_hurd.diff | 104 -----
debian/patches/libpoppler-0.12 | 41 --
debian/patches/series | 28 --
.../patches/unstymie-xetex-with-zlib-1.2.6.patch | 19 -
debian/patches/upstream-tex-file_arg-passing-fix | 70 ---
debian/patches/upstream-web2c-tmpfilewithpid | 33 --
debian/patches/xdvipdfmx-config-i-directive | 41 --
23 files changed, 8 insertions(+), 2190 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab0d33a..4bf23be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texlive-bin (2012.20120514-1) unstable; urgency=low
+
+ * UNRELEASED
+ * new upstream snapshot based on TL2012 tlpretest
+ * remove outdated and not needed patches
+
+ -- Norbert Preining <preining at debian.org> Mon, 14 May 2012 09:44:50 +0900
+
texlive-bin (2011.20120510-1) unstable; urgency=low
* new upstream checkout: fix for dvipdfmx
diff --git a/debian/patches/12c_fix_pdfcrop_invocation b/debian/patches/12c_fix_pdfcrop_invocation
deleted file mode 100644
index 9f19955..0000000
--- a/debian/patches/12c_fix_pdfcrop_invocation
+++ /dev/null
@@ -1,19 +0,0 @@
-12c_fix_pdfcrop_invocation.dpatch <preining at logic.at>
-Fix invocation of pdfcrop to get rid of magic
----
- texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl
-===================================================================
---- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl 2009-05-26 11:00:08.000000000 +0200
-+++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl 2009-05-27 22:17:17.000000000 +0200
-@@ -1,7 +1,5 @@
--eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-- if 0;
-+#!/usr/bin/perl -w
- use strict;
--$^W=1; # turn warning on
- #
- # pdfcrop.pl
- #
diff --git a/debian/patches/17_texdoc b/debian/patches/17_texdoc
deleted file mode 100644
index fa9fb2d..0000000
--- a/debian/patches/17_texdoc
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_texdoc.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: texdoc should follow symlinks, and man pages, and sec fixes, from tetex
-
- at DPATCH@
- texk/texlive/linked_scripts/texdoc/texdoc.tlu | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/texdoc/texdoc.tlu
-===================================================================
---- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/texdoc/texdoc.tlu 2009-05-26 11:00:08.000000000 +0200
-+++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/texdoc/texdoc.tlu 2009-05-27 22:20:00.000000000 +0200
-@@ -6,6 +6,9 @@
- Origial shell script by Thomas Esser, David Aspinall, and Simon Wilkinson.
- Public domain.]]
- --[[ Changelog
-+ 0.4-debian 2008-07
-+ - set support_zipped to true [fk]
-+
- 0.4 2008-07
- - moved configuration from texmf.cnf to texdoc.cnf
- - added an 'alias' feature
-@@ -77,7 +80,7 @@
- -- everything works for them (look for support_zipped in the code).
- -- If you use this feature, please let us know: if nobody uses it,
- -- we'll drop it at some point.
--support_zipped = false
-+support_zipped = true
-
-
- -- BEGIN function definitions (till the 'END' mark)
diff --git a/debian/patches/30_libpoppler_0.10 b/debian/patches/30_libpoppler_0.10
deleted file mode 100644
index a914aac..0000000
--- a/debian/patches/30_libpoppler_0.10
+++ /dev/null
@@ -1,513 +0,0 @@
-# 30_libpoppler.dpatch
-#
-# use libpoppler instead of libxpdf in pdfetex and xetex
-# don't build pdftosrc as it needs libpoppler from experimental
-
- at DPATCH@
- configure | 6 -
- configure.in | 8 -
- texk/web2c/pdftexdir/Makefile.in | 7 +
- texk/web2c/pdftexdir/depend.mk | 58 ----------
- texk/web2c/pdftexdir/pdftex.mk | 9 +
- texk/web2c/pdftexdir/pdftexextra.in | 2
- texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++----
- texk/web2c/pdftexdir/pdftosrc.cc | 39 +++---
- texk/web2c/pdftexdir/utils.c | 6 -
- texk/web2c/xetexdir/XeTeX_ext.c | 8 -
- texk/web2c/xetexdir/pdfimage.cpp | 26 +++-
- texk/web2c/xetexdir/xetex.mk | 12 +-
- 12 files changed, 100 insertions(+), 122 deletions(-)
-
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/depend.mk 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk 2009-03-10 20:06:13.000000000 +0100
-@@ -1,55 +1,5 @@
--epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
-- ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
-- ../../../libs/md5/md5.h pdftexextra.h \
-- ../../../libs/obsdcompat/openbsd-compat.h
--vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
-- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
-- ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
--writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h macnames.c
--writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
-- ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
-- ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
-- ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
-- ../../../libs/xpdf/xpdf/Error.h epdf.h
-+pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
-+ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
-+ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
- ttf2afm.o: ttf2afm.c writettf.h macnames.c
--pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
-- ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
-- ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
-- ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
-- ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h
-+pdftosrc.o: pdftosrc.cc
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc 2009-03-10 20:06:13.000000000 +0100
-@@ -24,25 +24,24 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include <config.h>
- #include <assert.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Link.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
--
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
- #include "epdf.h"
-
- static const char _svn_version[] =
-@@ -159,7 +158,7 @@
- fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
- p->occurences);
- #endif
-- GString *docName = new GString(p->file_name);
-+ GooString *docName = new GooString(p->file_name);
- p->doc = new PDFDoc(docName); // takes ownership of docName
- if (!p->doc->isOk() || !p->doc->okToPrint()) {
- pdftex_fail("xpdf: reading PDF image failed");
-@@ -520,7 +519,7 @@
- int i, l, c;
- Ref ref;
- char *p;
-- GString *s;
-+ GooString *s;
- if (obj->isBool()) {
- pdf_printf("%s", obj->getBool()? "true" : "false");
- } else if (obj->isInt()) {
-@@ -713,7 +712,7 @@
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
- if (page_name) {
- // get page by name
-- GString name(page_name);
-+ GooString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
- if (link == 0 || !link->isOk())
- pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftosrc.cc 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc 2009-03-10 20:06:13.000000000 +0100
-@@ -23,22 +23,23 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
- #include <assert.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
-+
-+#include <dirent.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-
- static const char _svn_version[] =
- "$Id: pdftosrc.cc 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc $";
-@@ -49,7 +50,7 @@
- {
- char *p, buf[1024];
- PDFDoc *doc;
-- GString *fileName;
-+ GooString *fileName;
- Stream *s;
- Object srcStream, srcName, catalogDict;
- FILE *outfile;
-@@ -63,8 +64,8 @@
- "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
- exit(1);
- }
-- fileName = new GString(argv[1]);
-- globalParams = new GlobalParams();
-+ fileName = new GooString(argv[1]);
-+ globalParams = new GlobalParams(NULL);
- doc = new PDFDoc(fileName);
- if (!doc->isOk()) {
- fprintf(stderr, "Invalid PDF file\n");
-@@ -84,7 +85,7 @@
- }
- srcStream.initNull();
- if (objnum == 0) {
-- catalogDict.dictLookup("SourceObject", &srcStream);
-+ catalogDict.dictLookup(UGooString("SourceObject"), &srcStream);
- if (!srcStream.isStream("SourceFile")) {
- fprintf(stderr, "No SourceObject found\n");
- exit(1);
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/Makefile.in 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in 2009-03-10 20:06:13.000000000 +0100
-@@ -11,6 +11,7 @@
- ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
- -I. -I$(srcdir) \
- -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
-+ -I/usr/include/poppler \
- @LIBXPDFCPPFLAGS@ \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
- -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \
-@@ -38,11 +39,15 @@
- LIBOBSDCOMPATDIR=../../../libs/obsdcompat
- LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-
-+POPPLERVERSION=`pkg-config --modversion poppler`
-+
- XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
- -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
- -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
-- -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
-+ -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX \
-+ -DPOPPLERVERSION=\"$(POPPLERVERSION)\"
-+
-
- OBJS = epdf.o mapfile.o utils.o vfpacket.o pkin.o \
- writefont.o writet1.o writet3.o writezip.o writeenc.o writettf.o \
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftex.mk 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk 2009-03-10 20:06:13.000000000 +0100
-@@ -3,6 +3,9 @@
- # differ between releases of pdfeTeX.
- # $Id: pdftex.mk 9446 2008-07-11 06:51:52Z thanh $
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
- # We build pdftex
- pdftex = @PETEX@ pdftex
- pdftexdir = pdftexdir
-@@ -30,7 +33,7 @@
-
- # Making pdftex
- pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
-- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
-
- # C file dependencies.
- $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
-@@ -135,10 +138,10 @@
- rm -f ttf2afm.c macnames.c
- #
- # pdftosrc
--pdftosrc = pdftosrc
-+pdftosrc =
-
- pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
-- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS)
- $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
- cd $(pdftexdir) && $(MAKE) pdftosrc.o
- check: pdftosrc-check
-Index: texlive-bin-2008.svn12198/configure
-===================================================================
---- texlive-bin-2008.svn12198.orig/configure 2009-03-10 20:06:05.000000000 +0100
-+++ texlive-bin-2008.svn12198/configure 2009-03-10 20:06:13.000000000 +0100
-@@ -6835,9 +6835,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-Index: texlive-bin-2008.svn12198/configure.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/configure.in 2009-03-10 20:06:05.000000000 +0100
-+++ texlive-bin-2008.svn12198/configure.in 2009-03-10 20:06:13.000000000 +0100
-@@ -163,9 +163,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-@@ -220,7 +220,7 @@
- sinclude(libs/ncurses/ncurses.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/libpng/libpng.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- sinclude(libs/freetype/freetype.ac)
- sinclude(libs/freetype2/freetype2.ac)
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/XeTeX_ext.c 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c 2009-03-10 20:06:13.000000000 +0100
-@@ -33,7 +33,7 @@
- */
-
- #ifdef XETEX_OTHER
--#include "xpdf/config.h"
-+#include "poppler/poppler-config.h"
- #include "png.h"
- #endif
-
-@@ -190,7 +190,7 @@
- #else
- "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
- "Compiled with libpng version %s; using %s\n"
-- "Compiled with xpdf version %s\n"
-+ "Compiled with libpoppler version %s\n"
- #endif
- ;
-
-@@ -201,7 +201,7 @@
- #ifdef XETEX_OTHER
- + strlen(PNG_LIBPNG_VER_STRING)
- + strlen(png_libpng_ver)
-- + strlen(xpdfVersion)
-+ + strlen(POPPLERVERSION)
- + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
- #endif
- + 6 * 3; /* for freetype version #s (ditto) */
-@@ -226,7 +226,7 @@
- FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
- fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
-- xpdfVersion
-+ POPPLERVERSION
- #endif
- );
- }
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/pdfimage.cpp 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp 2009-03-10 20:06:59.000000000 +0100
-@@ -11,10 +11,24 @@
-
- #include "pdfimage.h"
-
--#include "PDFDoc.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GString.h"
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-+
-
- #include "XeTeX_ext.h"
-
-@@ -29,7 +43,7 @@
- pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
- /* return the box converted to TeX points */
- {
-- GString* name = new GString(filename);
-+ GooString* name = new GooString(filename);
- PDFDoc* doc = new PDFDoc(name);
-
- if (!doc) {
-@@ -88,7 +102,7 @@
- pdf_count_pages(char* filename)
- {
- int pages = 0;
-- GString* name = new GString(filename);
-+ GooString* name = new GooString(filename);
- PDFDoc* doc = new PDFDoc(name);
-
- if (!doc) {
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/xetex.mk 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk 2009-03-10 20:06:13.000000000 +0100
-@@ -8,6 +8,10 @@
- # but need to check possible effect on other programs
- ALL_CXXFLAGS = @CXXFLAGS@
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
-+
- # We build xetex unless configure decides to skip it
- xetex = @XETEX@ xetex
-
-@@ -33,7 +37,7 @@
-
- @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-
-- at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
-+ at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS)
-
- @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
-
-@@ -168,7 +172,7 @@
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
-
- pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
-- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
-+ $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@
-
- XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-@@ -214,9 +218,11 @@
- $(XeTeXFontHdrs) $(GRAPHITESRCDIR)/include/graphite/Font.h
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(GRAPHITEFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-+POPPLERVERSION=`pkg-config --modversion poppler`
-+
- # special rules for files that need the TECkit headers as well
- XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h
-- $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
-+ $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -DPOPPLERVERSION=\"$(POPPLERVERSION)\" -c $< -o $@
- XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
- $(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/utils.c 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c 2009-03-10 20:06:13.000000000 +0100
-@@ -35,7 +35,7 @@
- #include "zlib.h"
- #include "ptexlib.h"
- #include "png.h"
--#include "xpdf/config.h" /* just to get the xpdf version */
-+#include "poppler/poppler-config.h" /* just to get the xpdf version */
-
- static const char _svn_version[] =
- "$Id: utils.c 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
-@@ -1267,9 +1267,9 @@
- (void) asprintf(versions,
- "Compiled with libpng %s; using libpng %s\n"
- "Compiled with zlib %s; using zlib %s\n"
-- "Compiled with xpdf version %s\n",
-+ "Compiled with libpoppler version %s\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
-- ZLIB_VERSION, zlib_version, xpdfVersion);
-+ ZLIB_VERSION, zlib_version, POPPLERVERSION);
- }
-
-
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftexextra.in 2009-03-10 20:05:59.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in 2009-03-10 20:06:13.000000000 +0100
-@@ -26,7 +26,7 @@
- (generated from ../lib/texmfmp.c).
- */
-
--#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
-+#define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
- #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
- #define AUTHOR NULL
- #define PROGRAM_HELP PDFTEXHELP
diff --git a/debian/patches/30_libpoppler_0.4.5 b/debian/patches/30_libpoppler_0.4.5
deleted file mode 100644
index 9d4af64..0000000
--- a/debian/patches/30_libpoppler_0.4.5
+++ /dev/null
@@ -1,440 +0,0 @@
-# 30_libpoppler.dpatch
-#
-# use libpoppler instead of libxpdf in pdfetex and xetex
-# don't build pdftosrc as it needs libpoppler from experimental
-
- at DPATCH@
- configure | 6 +-
- configure.in | 8 +--
- texk/web2c/pdftexdir/Makefile.in | 2
- texk/web2c/pdftexdir/depend.mk | 58 +------------------------
- texk/web2c/pdftexdir/pdftex.mk | 9 ++-
- texk/web2c/pdftexdir/pdftoepdf.cc | 43 +++++++++---------
- texk/web2c/pdftexdir/pdftosrc.cc | 37 ++++++++-------
- texk/web2c/pdftexdir/utils.c | 4 -
- texk/web2c/xetexdir/XeTeX_ext.c | 4 -
- texk/web2c/xetexdir/pdfimage.cpp | 24 ++++++++--
- texk/web2c/xetexdir/xetex.mk | 8 ++-
- 11 files changed, 87 insertions(+), 116 deletions(-)
-
-Index: texlive-bin-2007/texk/web2c/pdftexdir/depend.mk
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/depend.mk 2006-12-27 00:37:34.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/depend.mk 2007-04-16 15:30:03.000000000 +0200
-@@ -1,55 +1,5 @@
--epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
-- ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
-- ../../../libs/md5/md5.h pdftexextra.h \
-- ../../../libs/obsdcompat/openbsd-compat.h
--vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
-- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
-- ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
--writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h macnames.c
--writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
-- ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
-- ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
-- ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
-- ../../../libs/xpdf/xpdf/Error.h epdf.h
-+pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
-+ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
-+ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
- ttf2afm.o: ttf2afm.c writettf.h macnames.c
--pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
-- ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
-- ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
-- ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
-- ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h
-+pdftosrc.o: pdftosrc.cc
-Index: texlive-bin-2007/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2006-12-27 00:37:34.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2007-04-16 15:30:03.000000000 +0200
-@@ -26,25 +26,24 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include <config.h>
- #include <assert.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Link.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
--
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
- #include "epdf.h"
-
- // This file is mostly C and not very much C++; it's just used to interface
-@@ -169,7 +168,7 @@
- fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
- p->occurences);
- #endif
-- GString *docName = new GString(p->file_name);
-+ GooString *docName = new GooString(p->file_name);
- p->doc = new PDFDoc(docName); // takes ownership of docName
- if (!p->doc->isOk() || !p->doc->okToPrint()) {
- pdftex_fail("xpdf: reading PDF image failed");
-@@ -511,7 +510,7 @@
- int i, l, c;
- Ref ref;
- char *p;
-- GString *s;
-+ GooString *s;
- if (obj->isBool()) {
- pdf_printf("%s", obj->getBool()? "true" : "false");
- } else if (obj->isInt()) {
-@@ -677,7 +676,7 @@
- float pdf_version_found, pdf_version_wanted;
- // initialize
- if (!isInit) {
-- globalParams = new GlobalParams();
-+ globalParams = new GlobalParams(NULL);
- globalParams->setErrQuiet(gFalse);
- isInit = gTrue;
- }
-@@ -703,7 +702,7 @@
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
- if (page_name) {
- // get page by name
-- GString name(page_name);
-+ GooString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
- if (link == 0 || !link->isOk())
- pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-Index: texlive-bin-2007/texk/web2c/pdftexdir/pdftosrc.cc
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/pdftosrc.cc 2006-12-27 00:37:34.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/pdftosrc.cc 2007-04-16 15:30:03.000000000 +0200
-@@ -25,22 +25,23 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
- #include <assert.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
-+
-+#include <dirent.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-
- static XRef *xref = 0;
-
-@@ -48,7 +49,7 @@
- {
- char *p, buf[1024];
- PDFDoc *doc;
-- GString *fileName;
-+ GooString *fileName;
- Stream *s;
- Object srcStream, srcName, catalogDict;
- FILE *outfile;
-@@ -62,8 +63,8 @@
- "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
- exit(1);
- }
-- fileName = new GString(argv[1]);
-- globalParams = new GlobalParams();
-+ fileName = new GooString(argv[1]);
-+ globalParams = new GlobalParams(NULL);
- doc = new PDFDoc(fileName);
- if (!doc->isOk()) {
- fprintf(stderr, "Invalid PDF file\n");
-Index: texlive-bin-2007/texk/web2c/pdftexdir/Makefile.in
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/Makefile.in 2006-12-27 00:37:34.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/Makefile.in 2007-04-16 15:30:03.000000000 +0200
-@@ -8,7 +8,7 @@
- kpathsea_srcdir_parent = $(srcdir)/../..
- kpathsea_dir_parent = ../..
-
--ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@ -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..
-+ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) -I/usr/include/poppler -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..
- CXX = @CXX@
-
- .SUFFIXES: .cc .o
-Index: texlive-bin-2007/texk/web2c/pdftexdir/pdftex.mk
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/pdftex.mk 2006-12-27 00:37:34.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/pdftex.mk 2007-04-16 15:30:03.000000000 +0200
-@@ -2,6 +2,9 @@
- # This fragment contains the parts of the makefile that are most likely to
- # differ between releases of pdfeTeX.
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
- # We build pdftex
- pdftex = @PETEX@ pdftex
- pdftexdir = pdftexdir
-@@ -29,7 +32,7 @@
-
- # Making pdftex
- pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
-- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
-
- # C file dependencies.
- $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
-@@ -153,10 +156,10 @@
- rm -f ttf2afm.c macnames.c
- #
- # pdftosrc
--pdftosrc = pdftosrc
-+pdftosrc =
-
- pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
-- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS)
- $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
- cd $(pdftexdir) && $(MAKE) pdftosrc.o
- check: pdftosrc-check
-Index: texlive-bin-2007/configure
-===================================================================
---- texlive-bin-2007.orig/configure 2007-04-16 15:29:55.000000000 +0200
-+++ texlive-bin-2007/configure 2007-04-16 15:30:03.000000000 +0200
-@@ -3459,9 +3459,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-Index: texlive-bin-2007/configure.in
-===================================================================
---- texlive-bin-2007.orig/configure.in 2007-04-16 15:29:55.000000000 +0200
-+++ texlive-bin-2007/configure.in 2007-04-16 15:30:03.000000000 +0200
-@@ -157,9 +157,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-@@ -207,7 +207,7 @@
- sinclude(libs/libpng/libpng.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/ncurses/ncurses.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- sinclude(libs/gd/gd.ac)
- sinclude(libs/freetype/freetype.ac)
-Index: texlive-bin-2007/texk/web2c/xetexdir/XeTeX_ext.c
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/xetexdir/XeTeX_ext.c 2007-01-15 14:04:36.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/xetexdir/XeTeX_ext.c 2007-04-16 15:30:03.000000000 +0200
-@@ -33,7 +33,7 @@
- */
-
- #ifdef XETEX_OTHER
--#include "xpdf/config.h"
-+#include "poppler/poppler-config.h"
- #include "png.h"
- #endif
-
-@@ -194,7 +194,7 @@
- #else
- "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
- "Compiled with libpng version %s; using %s\n"
-- "Compiled with xpdf version %s\n"
-+ "Compiled with libpoppler version %s\n"
- #endif
- ;
-
-Index: texlive-bin-2007/texk/web2c/xetexdir/pdfimage.cpp
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/xetexdir/pdfimage.cpp 2006-12-09 11:29:12.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/xetexdir/pdfimage.cpp 2007-04-16 15:30:03.000000000 +0200
-@@ -11,10 +11,24 @@
-
- #include "pdfimage.h"
-
--#include "PDFDoc.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GString.h"
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-+
-
- #include "XeTeX_ext.h"
-
-@@ -28,7 +42,7 @@
- int
- pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
- {
-- GString* name = new GString(filename);
-+ GooString* name = new GooString(filename);
- PDFDoc* doc = new PDFDoc(name);
-
- if (!doc) {
-Index: texlive-bin-2007/texk/web2c/xetexdir/xetex.mk
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/xetexdir/xetex.mk 2007-01-20 13:44:35.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/xetexdir/xetex.mk 2007-04-16 15:30:03.000000000 +0200
-@@ -4,6 +4,10 @@
-
- Makefile: $(srcdir)/xetexdir/xetex.mk
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
-+
- # We build xetex unless configure decides to skip it
- xetex = @XETEX@ xetex
-
-@@ -29,7 +33,7 @@
-
- @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-
-- at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
-+ at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS)
-
- @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
-
-@@ -144,7 +148,7 @@
- $(compile) $(ALL_CFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
-
- pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
-- $(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
-+ $(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@
-
- XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
- $(compile) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-Index: texlive-bin-2007/texk/web2c/pdftexdir/utils.c
-===================================================================
---- texlive-bin-2007.orig/texk/web2c/pdftexdir/utils.c 2007-01-01 18:20:03.000000000 +0100
-+++ texlive-bin-2007/texk/web2c/pdftexdir/utils.c 2007-04-16 15:30:03.000000000 +0200
-@@ -37,7 +37,7 @@
- #include "zlib.h"
- #include "ptexlib.h"
- #include "png.h"
--#include "xpdf/config.h" /* just to get the xpdf version */
-+#include "poppler/poppler-config.h" /* just to get the xpdf version */
-
- #define check_nprintf(size_get, size_want) \
- if ((unsigned)(size_get) >= (unsigned)(size_want)) \
-@@ -1261,7 +1261,7 @@
- (void) asprintf(versions,
- "Compiled with libpng %s; using libpng %s\n"
- "Compiled with zlib %s; using zlib %s\n"
-- "Compiled with xpdf version %s\n",
-+ "Compiled with libpoppler version %s\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
- }
diff --git a/debian/patches/30_libpoppler_0.5.9 b/debian/patches/30_libpoppler_0.5.9
deleted file mode 100644
index f5a028d..0000000
--- a/debian/patches/30_libpoppler_0.5.9
+++ /dev/null
@@ -1,454 +0,0 @@
-# 30_libpoppler.dpatch
-#
-# use libpoppler instead of libxpdf in pdfetex and xetex
-# don't build pdftosrc as it needs libpoppler from experimental
-
- at DPATCH@
- configure | 6 -
- configure.in | 8 -
- texk/web2c/pdftexdir/Makefile.in | 2
- texk/web2c/pdftexdir/depend.mk | 58 ----------
- texk/web2c/pdftexdir/pdftex.mk | 9 +
- texk/web2c/pdftexdir/pdftexextra.in | 2
- texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++----
- texk/web2c/pdftexdir/pdftosrc.cc | 39 +++---
- texk/web2c/pdftexdir/utils.c | 4
- texk/web2c/xetexdir/XeTeX_ext.c | 4
- texk/web2c/xetexdir/pdfimage.cpp | 24 +++-
- texk/web2c/xetexdir/xetex.mk | 8 +
- 12 files changed, 88 insertions(+), 117 deletions(-)
-
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/depend.mk 2008-03-23 17:38:33.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk 2009-02-21 22:40:51.000000000 +0100
-@@ -1,55 +1,5 @@
--epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
-- ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
-- ../../../libs/md5/md5.h pdftexextra.h \
-- ../../../libs/obsdcompat/openbsd-compat.h
--vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
-- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
-- ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
-- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
--writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
--writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h
--writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h macnames.c
--writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
-- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
-- ptexmac.h image.h
--pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
-- ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
-- ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
-- ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
-- ../../../libs/xpdf/xpdf/Error.h epdf.h
-+pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
-+ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
-+ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
- ttf2afm.o: ttf2afm.c writettf.h macnames.c
--pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \
-- ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
-- ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
-- ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
-- ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
-- ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h
-+pdftosrc.o: pdftosrc.cc
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2008-08-12 19:15:53.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc 2009-02-21 22:40:51.000000000 +0100
-@@ -24,25 +24,24 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include <config.h>
- #include <assert.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Link.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
--
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
- #include "epdf.h"
-
- static const char _svn_version[] =
-@@ -159,7 +158,7 @@
- fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
- p->occurences);
- #endif
-- GString *docName = new GString(p->file_name);
-+ GooString *docName = new GooString(p->file_name);
- p->doc = new PDFDoc(docName); // takes ownership of docName
- if (!p->doc->isOk() || !p->doc->okToPrint()) {
- pdftex_fail("xpdf: reading PDF image failed");
-@@ -520,7 +519,7 @@
- int i, l, c;
- Ref ref;
- char *p;
-- GString *s;
-+ GooString *s;
- if (obj->isBool()) {
- pdf_printf("%s", obj->getBool()? "true" : "false");
- } else if (obj->isInt()) {
-@@ -713,7 +712,7 @@
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
- if (page_name) {
- // get page by name
-- GString name(page_name);
-+ GooString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
- if (link == 0 || !link->isOk())
- pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftosrc.cc 2008-05-08 16:25:16.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc 2009-02-21 22:40:51.000000000 +0100
-@@ -23,22 +23,23 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
- #include <assert.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
-+
-+#include <dirent.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-
- static const char _svn_version[] =
- "$Id: pdftosrc.cc 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc $";
-@@ -49,7 +50,7 @@
- {
- char *p, buf[1024];
- PDFDoc *doc;
-- GString *fileName;
-+ GooString *fileName;
- Stream *s;
- Object srcStream, srcName, catalogDict;
- FILE *outfile;
-@@ -63,8 +64,8 @@
- "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
- exit(1);
- }
-- fileName = new GString(argv[1]);
-- globalParams = new GlobalParams();
-+ fileName = new GooString(argv[1]);
-+ globalParams = new GlobalParams(NULL);
- doc = new PDFDoc(fileName);
- if (!doc->isOk()) {
- fprintf(stderr, "Invalid PDF file\n");
-@@ -84,7 +85,7 @@
- }
- srcStream.initNull();
- if (objnum == 0) {
-- catalogDict.dictLookup("SourceObject", &srcStream);
-+ catalogDict.dictLookup(UGooString("SourceObject"), &srcStream);
- if (!srcStream.isStream("SourceFile")) {
- fprintf(stderr, "No SourceObject found\n");
- exit(1);
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/Makefile.in 2008-07-17 19:58:14.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in 2009-02-21 22:42:43.000000000 +0100
-@@ -11,7 +11,7 @@
- ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
- -I. -I$(srcdir) \
- -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
-- @LIBXPDFCPPFLAGS@ \
-+ -I/usr/include/poppler \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
- -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \
- -DPDF_PARSER_ONLY
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftex.mk 2008-07-11 08:51:52.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk 2009-02-21 22:40:51.000000000 +0100
-@@ -3,6 +3,9 @@
- # differ between releases of pdfeTeX.
- # $Id: pdftex.mk 9446 2008-07-11 06:51:52Z thanh $
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
- # We build pdftex
- pdftex = @PETEX@ pdftex
- pdftexdir = pdftexdir
-@@ -30,7 +33,7 @@
-
- # Making pdftex
- pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
-- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
-
- # C file dependencies.
- $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
-@@ -135,10 +138,10 @@
- rm -f ttf2afm.c macnames.c
- #
- # pdftosrc
--pdftosrc = pdftosrc
-+pdftosrc =
-
- pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
-- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
-+ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS)
- $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
- cd $(pdftexdir) && $(MAKE) pdftosrc.o
- check: pdftosrc-check
-Index: texlive-bin-2008.svn12198/configure
-===================================================================
---- texlive-bin-2008.svn12198.orig/configure 2009-02-21 22:34:42.000000000 +0100
-+++ texlive-bin-2008.svn12198/configure 2009-02-21 22:40:51.000000000 +0100
-@@ -6835,9 +6835,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-Index: texlive-bin-2008.svn12198/configure.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/configure.in 2009-02-21 22:34:42.000000000 +0100
-+++ texlive-bin-2008.svn12198/configure.in 2009-02-21 22:43:36.000000000 +0100
-@@ -163,9 +163,9 @@
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-@@ -220,7 +220,7 @@
- sinclude(libs/ncurses/ncurses.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/libpng/libpng.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- sinclude(libs/freetype/freetype.ac)
- sinclude(libs/freetype2/freetype2.ac)
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/XeTeX_ext.c 2008-08-01 15:54:24.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c 2009-02-21 22:40:51.000000000 +0100
-@@ -33,7 +33,7 @@
- */
-
- #ifdef XETEX_OTHER
--#include "xpdf/config.h"
-+#include "poppler/poppler-config.h"
- #include "png.h"
- #endif
-
-@@ -190,7 +190,7 @@
- #else
- "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
- "Compiled with libpng version %s; using %s\n"
-- "Compiled with xpdf version %s\n"
-+ "Compiled with libpoppler version %s\n"
- #endif
- ;
-
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/pdfimage.cpp 2008-05-21 15:43:19.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp 2009-02-21 22:40:51.000000000 +0100
-@@ -11,10 +11,24 @@
-
- #include "pdfimage.h"
-
--#include "PDFDoc.h"
--#include "Catalog.h"
--#include "Page.h"
--#include "GString.h"
-+#include <dirent.h>
-+#include <poppler/poppler-config.h>
-+#include <poppler/goo/GooString.h>
-+#include <poppler/goo/gmem.h>
-+#include <poppler/goo/gfile.h>
-+#include "poppler/Object.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/XRef.h"
-+#include "poppler/Link.h"
-+#include "poppler/Catalog.h"
-+#include "poppler/Page.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/PDFDoc.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/Error.h"
-+
-
- #include "XeTeX_ext.h"
-
-@@ -29,7 +43,7 @@
- pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
- /* return the box converted to TeX points */
- {
-- GString* name = new GString(filename);
-+ GooString* name = new GooString(filename);
- PDFDoc* doc = new PDFDoc(name);
-
- if (!doc) {
-Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/xetex.mk 2008-06-03 17:24:50.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk 2009-02-21 22:45:11.000000000 +0100
-@@ -8,6 +8,10 @@
- # but need to check possible effect on other programs
- ALL_CXXFLAGS = @CXXFLAGS@
-
-+# use libpoppler instead of included xpdf code
-+ADDLDFLAGS = -lpoppler
-+
-+
- # We build xetex unless configure decides to skip it
- xetex = @XETEX@ xetex
-
-@@ -33,7 +37,7 @@
-
- @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-
-- at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
-+ at XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS)
-
- @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
-
-@@ -168,7 +172,7 @@
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
-
- pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
-- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
-+ $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@
-
- XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/utils.c 2008-05-08 16:25:16.000000000 +0200
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c 2009-02-21 22:40:51.000000000 +0100
-@@ -35,7 +35,7 @@
- #include "zlib.h"
- #include "ptexlib.h"
- #include "png.h"
--#include "xpdf/config.h" /* just to get the xpdf version */
-+#include "poppler/poppler-config.h" /* just to get the xpdf version */
-
- static const char _svn_version[] =
- "$Id: utils.c 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
-@@ -1267,7 +1267,7 @@
- (void) asprintf(versions,
- "Compiled with libpng %s; using libpng %s\n"
- "Compiled with zlib %s; using zlib %s\n"
-- "Compiled with xpdf version %s\n",
-+ "Compiled with libpoppler version %s\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
- }
-Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in
-===================================================================
---- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftexextra.in 2008-03-23 17:38:33.000000000 +0100
-+++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in 2009-02-21 22:46:18.000000000 +0100
-@@ -26,7 +26,7 @@
- (generated from ../lib/texmfmp.c).
- */
-
--#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
-+#define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
- #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
- #define AUTHOR NULL
- #define PROGRAM_HELP PDFTEXHELP
diff --git a/debian/patches/52_feynmf-perl-sec-fix b/debian/patches/52_feynmf-perl-sec-fix
deleted file mode 100644
index 13c2d4f..0000000
--- a/debian/patches/52_feynmf-perl-sec-fix
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 52_feynmf-perl-sec-fix.dpatch by Kevin B. McCarty
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: secure tmp file handling
-
- at DPATCH@
---- ./texmf-dist/source/texlive-20080816-source/latex/feynmf/feynmf.pl.orig
-+++ ./texmf-dist/source/texlive-20080816-source/latex/feynmf/feynmf.pl
-@@ -270,10 +270,11 @@
- my @tfm = @_;
- # Prepare a fake temporary PL file
- # (/dev/null won't do, because the font must not be empty):
-- my ($pl) = "/tmp/feynmf$$.pl";
-+ my ($pl) = `/bin/tempfile -p feynmf -s .pl`;
- my ($tfm);
- $pltotf_prog
- or die "feynmf: fatal: pltopf programm required unless -notfm\n";
-+ chop ($pl);
- open (PL, ">$pl") or die "feynmf: can't open temporary file $pl: $!\n";
- push @temporay_files, $pl;
- print PL <<__END_PL__;
-@@ -373,7 +374,7 @@
- maybe_run "$gftopk_prog $gf" if $gftopk_prog;
- }
- }
-- close (<LOG>);
-+ close (LOG);
- }
- }
- }
diff --git a/debian/patches/56_updmap_deb b/debian/patches/56_updmap_deb
deleted file mode 100644
index 54a0a22..0000000
--- a/debian/patches/56_updmap_deb
+++ /dev/null
@@ -1,143 +0,0 @@
----
- texk/tetex/updmap | 23 ++++++++++++++++-------
- texk/tetex/updmap.man | 27 +++++++++++++++++++--------
- 2 files changed, 35 insertions(+), 15 deletions(-)
-
-Index: texlive-bin-2009~svn15596/texk/tetex/updmap.man
-===================================================================
---- texlive-bin-2009~svn15596.orig/texk/tetex/updmap.man 2009-08-15 08:13:49.000000000 +0900
-+++ texlive-bin-2009~svn15596/texk/tetex/updmap.man 2009-10-03 23:37:05.000000000 +0900
-@@ -32,11 +32,20 @@
- line, \fBupdmap\fP will write generated map files to a directory of
- your choosing (via one of the \fB--*outputdir\fP options), or automatically
- determine where to place the files\&. In the latter case, it tries to
--use the tree where the variable TEXMFVAR points to.
-+use the tree where the variable TEXMFVAR -- or TEXMFSYSVAR if called
-+as \fBupdmap-sys\fP -- points to.
-+.PP
- When used with the options \fB--edit\fP, \fB--setoption\fP,
--\fB--enable\fP, \fB--disable\fP, or \fB--syncwithtrees\fP, \fBupdmap\fP will first write
--\fBupdmap\&.cfg\fP(5) and regenerate the map files only if this file
--has been changed\&.
-+\fB--enable\fP, \fB--disable\fP, or \fB--syncwithtrees\fP,
-+\fBupdmap\fP will first write \fBupdmap\&.cfg\fP(5) and regenerate the
-+map files only if this file has been changed\&. In Debian, updmap has
-+been adapted so that \fB--enable\fP and \fB--disable\fP do the "right
-+thing": change the configuration snippets in \fIupdmap.d\fP instead,
-+call \fBupdate-updmap\fP(1) to regenerate \fBupdmap\&.cfg\fP(5) and
-+regenerate the map files afterwards. There are some limitations,
-+though: \fBupdmap\fP will regenerate the map files even if
-+\fBupdmap\&.cfg\fP(5) has not been changed, and \fB--edit\fP and
-+\fB--syncwithtrees\fP cannot be used.
- .PP
- .SH "OPTIONS"
- .PP
-@@ -98,10 +107,10 @@
- \fBdvipdfmDownloadBase14\fP
- .IP
- .IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP"
--Add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&.
-+Permanently add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&.
- .IP
- .IP "\fB--enable Map=\fImapfile\fP"
--Add or enable a Map for \fImapfile\fP\&.
-+Permanently add or enable a Map for \fImapfile\fP\&.
- .IP
- .IP "\fB--enable MixedMap=\fP\fImapfile\fP"
- Add or enable a MixedMap for \fImapfile\fP\&.
-@@ -126,7 +135,9 @@
- .IP "\fIupdmap\&.cfg\fP"
- Main configuration file\&. In
- \fItexmf/web2c\fP by default, but may be located elsewhere
--depending on your distribution\&.
-+depending on your distribution\&. \fBNote for Debian\fP: On Debian
-++ that file is generated out of files in \fI/etc/texmf/updmap.d\fP.
-++ See \fBupdate-updmap\fP(8) or the \fITeX-on-Debian\fP document.
- .IP
- .IP "\fIdvips35\&.map\fP"
- Map file for standard 35 PostScript fonts for
-@@ -240,7 +251,7 @@
- .PP
- .SH "SEE ALSO"
- .PP
--\fBupdmap\&.cfg\fP(5), \fBdvipdfm\fP(1), \fBdvips\fP(1),
-+\fBupdmap\&.cfg\fP(5), \fBupdate-updmap\fP(8), \fBdvipdfm\fP(1), \fBdvips\fP(1),
- \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
- \fBtexhash\fP(1), \fBxdvi\fP(1)\&.
- .PP
-Index: texlive-bin-2009~svn15596/texk/tetex/updmap
-===================================================================
---- texlive-bin-2009~svn15596.orig/texk/tetex/updmap 2009-07-24 02:09:15.000000000 +0900
-+++ texlive-bin-2009~svn15596/texk/tetex/updmap 2009-10-03 23:37:05.000000000 +0900
-@@ -350,6 +350,8 @@
- # sets option to value in the config file (replacing the existing setting
- # or by adding a new line to the config file).
- ###############################################################################
-+# for Debian, this is superseded by a function defined in debianize-updmap
-+# (see below)
- setOption()
- {
- opt=$1
-@@ -384,6 +386,8 @@
- # enableMap (type, map)
- # enables an entry in the config file for map with a given type.
- ###############################################################################
-+# for Debian, this is superseded by a function defined in debianize-updmap
-+# (see below)
- enableMap()
- {
- case $1 in
-@@ -406,6 +410,8 @@
- # disableMap (map)
- # disables map in config file (any type)
- ###############################################################################
-+# for Debian, this is superseded by a function defined in debianize-updmap
-+# (see below)
- disableMap()
- {
- #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-@@ -759,12 +765,8 @@
- !!! ERROR! The map file \`$2' has not been found at all.
-
- Either put this file into the right place or remove the
-- reference from the configuration file. An automatic way
-- to disable unavailable map files is to call
-- $progname --syncwithtrees
--
-- For manual editing, call
-- $progname --edit
-+ reference from the configuration files - see
-+ update-updmap(1).
- "
-
- false; return 1
-@@ -1071,6 +1073,8 @@
- # update the config file: uncomment all lines which refer to map files that
- # are unavailabe in the texmf trees
- ###############################################################################
-+# for Debian, this is superseded by a function defined in debianize-updmap
-+# (see below)
- syncWithTrees()
- {
- for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's at .* @@'`; do
-@@ -1084,6 +1088,11 @@
- }
-
- ###############################################################################
-+# source Debian-specific changes, superseding the last three functions
-+###############################################################################
-+. /usr/share/tex-common/debianize-updmap
-+
-+###############################################################################
- # normalizeLines()
- # remove comments, whitespace is exactly one space, no empty lines,
- # no whitespace at end of line, one space before and after ",
-@@ -1386,7 +1395,7 @@
-
- case "$cmd" in
- edit)
-- ${VISUAL-${EDITOR-vi}} "$cnfFile";;
-+ debianEditWarnAndShow;;
- setoption)
- setOption "$setoptionOpt" "$setoptionVal";;
- enable)
diff --git a/debian/patches/73_tex_segfault b/debian/patches/73_tex_segfault
deleted file mode 100644
index 72b0ca7..0000000
--- a/debian/patches/73_tex_segfault
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/texk/web2c/tex.ch 2011-07-07 21:26:55.779344956 +0200
-+++ b/texk/web2c/tex.ch 2009-08-12 23:40:14.000000000 +0200
-@@ -371,7 +371,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;
---- a/texk/web2c/xetexdir/xetex.ch 2011-07-07 21:26:55.779344956 +0200
-+++ b/texk/web2c/xetexdir/xetex.ch 2011-07-07 21:26:55.779344956 +0200
-@@ -335,7 +335,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;
diff --git a/debian/patches/cve-2010-0739.patch b/debian/patches/cve-2010-0739.patch
deleted file mode 100644
index 11c901a..0000000
--- a/debian/patches/cve-2010-0739.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: dospecial.c
-===================================================================
---- a/texk/dvipsk/dospecial.c (revision 17558)
-+++ b/texk/dvipsk/dospecial.c (revision 17569)
-@@ -297,6 +297,12 @@
- static int omega_specials = 0;
-
- if (nextstring + numbytes > maxstring) {
-+ if (numbytes < 0
-+ || (numbytes > 0 && 2 > INT_MAX / numbytes)
-+ || 2 * numbytes > 1000 + 2 * numbytes) {
-+ error("! Integer overflow in predospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * numbytes) ;
- maxstring = nextstring + 2 * numbytes + 700 ;
- }
diff --git a/debian/patches/cve-2010-0827.patch b/debian/patches/cve-2010-0827.patch
deleted file mode 100644
index 717666e..0000000
--- a/debian/patches/cve-2010-0827.patch
+++ /dev/null
@@ -1,28 +0,0 @@
----
- texk/dvipsk/virtualfont.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: texlive-bin-2009/texk/dvipsk/virtualfont.c
-===================================================================
---- texlive-bin-2009.orig/texk/dvipsk/virtualfont.c 2010-05-01 02:12:57.000000000 +0900
-+++ texlive-bin-2009/texk/dvipsk/virtualfont.c 2010-05-01 02:16:19.000000000 +0900
-@@ -36,7 +36,7 @@
- * Subroutine vfbyte returns the next byte.
- */
- static FILE *vffile ;
--static char name[50] ;
-+static char name[500] ;
- void
- badvf(char *s)
- {
-@@ -93,6 +93,10 @@
- if (*d==0)
- d = vfpath ;
- #endif
-+ if (strlen(n) + 5 >= sizeof (name)) {
-+ /* 5 for vf() + null */
-+ error("! VF file name too long in vfopen") ;
-+ }
- #ifdef MVSXA /* IBM: MVS/XA */
- (void)sprintf(name, "vf(%s)", n) ;
- #else
diff --git a/debian/patches/cve-2010-1440 b/debian/patches/cve-2010-1440
deleted file mode 100644
index a346807..0000000
--- a/debian/patches/cve-2010-1440
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix for CVE-2010-1440
-From Jan Lieskovsky <jlieskov at redhat.com>
-
- we decided to treat the CVE-2010-1440 issue as a completely
- new tetex / texlive issue, rather than an incomplete fix for CVE-2010-0739
- (in fact, the reproducer for CVE-2010-0739 is only catalyst / accelerator
- to see this flaw on ppc architecture, but in fact, it's another occurrence
- of integer overflow in teTeX / TeXLive code).
-
----
- texk/dvipsk/dospecial.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-Index: texlive-bin-2009/texk/dvipsk/dospecial.c
-===================================================================
---- texlive-bin-2009.orig/texk/dvipsk/dospecial.c 2010-05-01 02:15:09.000000000 +0900
-+++ texlive-bin-2009/texk/dvipsk/dospecial.c 2010-05-01 02:15:16.000000000 +0900
-@@ -333,7 +333,11 @@
- int j ;
- static int omega_specials = 0;
-
-- if (nextstring + numbytes > maxstring) {
-+ if (numbytes < 0 || numbytes > maxstring - nextstring) {
-+ if (numbytes < 0 || numbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in predospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * numbytes) ;
- maxstring = nextstring + 2 * numbytes + 700 ;
- }
-@@ -918,7 +922,11 @@
- char seen[NKEYS] ;
- float valseen[NKEYS] ;
-
-- if (nextstring + nbytes > maxstring) {
-+ if (nbytes < 0 || nbytes > maxstring - nextstring) {
-+ if (nbytes < 0 || nbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in bbdospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * nbytes) ;
- maxstring = nextstring + 2 * nbytes + 700 ;
- }
diff --git a/debian/patches/detex-hurd.diff b/debian/patches/detex-hurd.diff
deleted file mode 100644
index 483a380..0000000
--- a/debian/patches/detex-hurd.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix building on hurd-i386. From Samuel Thibault <samuel.thibault at ens-lyon.org>
-> There was also a problem with xxx.l which uses the NOFILE macro which is
-> linux-only.
----
- texk/detex/detex.l | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: texlive-bin-2009/texk/detex/detex.l
-===================================================================
---- texlive-bin-2009.orig/texk/detex/detex.l 2009-12-21 18:18:10.000000000 +0900
-+++ texlive-bin-2009/texk/detex/detex.l 2009-12-21 18:18:34.000000000 +0900
-@@ -59,6 +59,10 @@
-
- #endif
-
-+#ifndef NOFILE
-+#define NOFILE 256
-+#endif
-+
- void SetEnvIgnore(char *sbEnvList);
- int BeginEnv(char *sbEnv);
- int EndEnv(char *sbEnv);
diff --git a/debian/patches/dvipdfmx-config-i-directive b/debian/patches/dvipdfmx-config-i-directive
deleted file mode 100644
index 71f4969..0000000
--- a/debian/patches/dvipdfmx-config-i-directive
+++ /dev/null
@@ -1,42 +0,0 @@
----
- texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg | 3 +++
- texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c | 8 ++++++++
- 2 files changed, 11 insertions(+)
-
-Index: texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg 2011-05-09 18:18:23.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg 2012-03-30 10:33:25.410473003 +0900
-@@ -198,3 +198,6 @@
-
- %% Put additonal fontmap files here (usually for Type0 fonts)
- f cid-x.map
-+
-+%% Include other config files
-+%i <filename>
-Index: texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c
-===================================================================
---- texlive-bin-2011.20120328.orig/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c 2011-03-09 20:02:16.000000000 +0900
-+++ texlive-bin-2011.20120328/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c 2012-03-30 10:33:25.414473001 +0900
-@@ -102,6 +102,9 @@
- char *dvi_filename = NULL, *pdf_filename = NULL;
-
- static void
-+read_config_file (const char *config);
-+
-+static void
- set_default_pdf_filename(void)
- {
- const char *dvi_base;
-@@ -562,6 +565,11 @@
- case 'E':
- compat_mode = 1;
- break;
-+ case 'i':
-+ CHECK_ARG(1, "subsidiary config file");
-+ read_config_file(argv[1]);
-+ POP_ARG();
-+ break;
- case 'e':
- if (compat_mode) {
- WARN("dvipdfm \"-e\" option not supported.");
diff --git a/debian/patches/fix-mpost-segfault b/debian/patches/fix-mpost-segfault
deleted file mode 100644
index 6c541fe..0000000
--- a/debian/patches/fix-mpost-segfault
+++ /dev/null
@@ -1,17 +0,0 @@
----
- texk/web2c/mplibdir/mpxout.w | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: texlive-bin-2009/texk/web2c/mplibdir/mpxout.w
-===================================================================
---- texlive-bin-2009.orig/texk/web2c/mplibdir/mpxout.w 2009-12-21 08:05:13.000000000 +0900
-+++ texlive-bin-2009/texk/web2c/mplibdir/mpxout.w 2009-12-21 08:05:45.000000000 +0900
-@@ -260,6 +260,8 @@
- va_start(ap, msg);
- fprintf(stderr, "fatal: ");
- (void)vfprintf(stderr, msg, ap);
-+ va_end(ap);
-+ va_start(ap, msg);
- mpx_printf(mpx, "fatal", msg, ap);
- va_end(ap);
- mpx->history=mpx_fatal_error;
diff --git a/debian/patches/fmtutil-fix-infinite-loop_upstream b/debian/patches/fmtutil-fix-infinite-loop_upstream
deleted file mode 100644
index 116a1d9..0000000
--- a/debian/patches/fmtutil-fix-infinite-loop_upstream
+++ /dev/null
@@ -1,30 +0,0 @@
-inifinite loops should only be checked in mktexfmt mode to make sure that
-double defined format/engine combinations are accepted
-Included upstream, written by Norbert Preining
----
- texk/tetex/fmtutil | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: texlive-bin-2009/texk/tetex/fmtutil
-===================================================================
---- texlive-bin-2009.orig/texk/tetex/fmtutil 2011-05-24 21:54:12.000000000 +0200
-+++ texlive-bin-2009/texk/tetex/fmtutil 2011-05-24 21:55:52.000000000 +0200
-@@ -60,7 +60,7 @@
-
- progname=fmtutil
- argv0=$0
--version=20091009.0222
-+version=20091223.1047
-
- cnf=fmtutil.cnf # name of the config file
- export PATH
-@@ -701,6 +701,9 @@
- rm -f $fmtfile
-
- # Check for infinite recursion before running the iniTeX:
-+ # We do this check only if we are running in mktexfmt mode
-+ # otherwise double format definitions will create an infinite loop, too
-+ $mktexfmtMode || mktexfmt_loop=
- case :$mktexfmt_loop: in
- *:"$format/$engine":*)
- abort "Infinite recursion detected, giving up!" ;;
diff --git a/debian/patches/icu-xetex_hurd.diff b/debian/patches/icu-xetex_hurd.diff
deleted file mode 100644
index 0de5baa..0000000
--- a/debian/patches/icu-xetex_hurd.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urN icu-xetex.orig/aclocal.m4 icu-xetex/aclocal.m4
---- texlive-bin-2009.orig/libs/icu/icu-xetex.orig/aclocal.m4 2008-03-04 14:26:36.000000000 +0100
-+++ texlive-bin-2009/libs/icu/icu-xetex/aclocal.m4 2009-12-12 21:46:34.000000000 +0100
-@@ -31,6 +31,7 @@
- icu_cv_host_frag=mh-linux-va
- fi ;;
- *-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;;
-+*-*-gnu*) icu_cv_host_frag=mh-gnu ;;
- *-*-cygwin|*-*-mingw32)
- if test "$GCC" = yes; then
- AC_TRY_COMPILE([
-diff -urN icu-xetex.orig/config/mh-gnu icu-xetex/config/mh-gnu
---- texlive-bin-2009.orig/libs/icu/icu-xetex.orig/config/mh-gnu 1970-01-01 01:00:00.000000000 +0100
-+++ texlive-bin-2009/libs/icu/icu-xetex/config/mh-gnu 2009-12-12 21:42:43.000000000 +0100
-@@ -0,0 +1,78 @@
-+## -*-makefile-*-
-+## Linux-specific setup
-+## Copyright (c) 1999-2006, International Business Machines Corporation and
-+## others. All Rights Reserved.
-+
-+## Commands to generate dependency files
-+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-+
-+## Flags for position independent code
-+SHAREDLIBCFLAGS = -fPIC
-+SHAREDLIBCXXFLAGS = -fPIC
-+SHAREDLIBCPPFLAGS = -DPIC
-+
-+## Additional flags when building libraries and with threads
-+THREADSCPPFLAGS = -D_REENTRANT
-+LIBCPPFLAGS =
-+
-+## Compiler switch to embed a runtime search path
-+LD_RPATH=
-+LD_RPATH_PRE = -Wl,-rpath,
-+
-+## These are the library specific LDFLAGS
-+LDFLAGSICUDT=-nodefaultlibs -nostdlib
-+
-+## Compiler switch to embed a library name
-+# The initial tab in the next line is to prevent icu-config from reading it.
-+ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
-+#SH# # We can't depend on MIDDLE_SO_TARGET being set.
-+#SH# LD_SONAME=
-+
-+## Shared object suffix
-+SO = so
-+## Non-shared intermediate object suffix
-+STATIC_O = ao
-+
-+## Compilation rules
-+%.$(STATIC_O): $(srcdir)/%.c
-+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
-+%.o: $(srcdir)/%.c
-+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
-+
-+%.$(STATIC_O): $(srcdir)/%.cpp
-+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
-+%.o: $(srcdir)/%.cpp
-+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
-+
-+
-+## Dependency rules
-+%.d: $(srcdir)/%.c
-+ @echo "generating dependency information for $<"
-+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \
-+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-+ [ -s $@ ] || rm -f $@'
-+
-+%.d: $(srcdir)/%.cpp
-+ @echo "generating dependency information for $<"
-+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
-+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-+ [ -s $@ ] || rm -f $@'
-+
-+## Versioned libraries rules
-+
-+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-+ $(RM) $@ && ln -s ${<F} $@
-+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
-+
-+## Bind internal references
-+
-+# LDflags that pkgdata will use
-+BIR_LDFLAGS= -Wl,-Bsymbolic
-+
-+# Dependencies [i.e. map files] for the final library
-+BIR_DEPS=
-+
-+## End Linux-specific setup
-+
-diff -urN icu-xetex.orig/configure icu-xetex/configure
---- texlive-bin-2009.orig/libs/icu/icu-xetex.orig/configure 2008-03-19 15:11:43.000000000 +0100
-+++ texlive-bin-2009/libs/icu/icu-xetex/configure 2009-12-12 21:48:01.000000000 +0100
-@@ -3935,6 +3935,7 @@
- icu_cv_host_frag=mh-linux-va
- fi ;;
- *-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;;
-+*-*-gnu*) icu_cv_host_frag=mh-gnu ;;
- *-*-cygwin|*-*-mingw32)
- if test "$GCC" = yes; then
- cat >conftest.$ac_ext <<_ACEOF
diff --git a/debian/patches/libpoppler-0.12 b/debian/patches/libpoppler-0.12
deleted file mode 100644
index 6c523a7..0000000
--- a/debian/patches/libpoppler-0.12
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix FTBFS with poppler again, they will never be able to keep APIs
-
-Thanks to Ubuntu people for that patch
----
- texk/web2c/pdftexdir/pdftoepdf.cc | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-Index: texlive-bin-2009~svn15596/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- texlive-bin-2009~svn15596.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2009-10-18 10:21:47.000000000 +0900
-+++ texlive-bin-2009~svn15596/texk/web2c/pdftexdir/pdftoepdf.cc 2009-10-18 10:22:28.000000000 +0900
-@@ -650,7 +650,7 @@
- }
- for (r = encodingList; r != 0; r = n) {
- n = r->next;
-- delete r->font;
-+// delete r->font;
- delete r;
- }
- }
-@@ -690,6 +690,7 @@
- Page *page;
- int rotate;
- PDFRectangle *pagebox;
-+ int minor_pdf_version_found, major_pdf_version_found;
- float pdf_version_found, pdf_version_wanted;
- // initialize
- if (!isInit) {
-@@ -705,8 +706,11 @@
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-- pdf_version_found = pdf_doc->doc->getPDFVersion();
-+ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
-+ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
-+ pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1);
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-+
- if (pdf_version_found > pdf_version_wanted) {
- char msg[] =
- "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
diff --git a/debian/patches/series b/debian/patches/series
index 7c7effb..f9ccbb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,49 +1,21 @@
12_fix_epstopdf_invocation
12a_fix_thumbpdf_invocation
12b_fix_a2ping_invocation
-#2011# not applicable # 12c_fix_pdfcrop_invocation
12e_fix_vpe_invocation
-#2011# not applicable # 17_texdoc
23_use_xdvi.bin
-### for backports with poppler << 0.5 (etch)
-###30_libpoppler_0.4.5
-### for libpoppler 0.5 (not used anymore)
-###30_libpoppler_0.5.4
-### for double new libpoppler >= 0.5.9 (lenny)
-###30_libpoppler_0.5.9
-# for unstable
-# 30_libpoppler_0.10
41_maketexmf
50_fmtutil_deb
51_fmtutil_keep_failedlog
-# not ready, we do not ship feynmf by now
-# 52_feynmf-perl-sec-fix
53_builtin-searchpath-fix
55_texconfig_stuff
-#2011# TODO TODO TODO TODO TODO !!!!!! # 56_updmap_deb
-#2011# we also need to set -e or check return values in updmap!!!
57_texconfig_papersizes_for_upstream
58_texconfig_papersizes_use_ucf
set-e-in-various-scripts
-#2011# disabled - do we need to fix that???# libpoppler-0.12
-#2011# disabled not applicable, still necessary? # icu-xetex_hurd.diff
-#2011# upstream included # fix-mpost-segfault
-#2011# not applicable # detex-hurd.diff
-#2011# upstream # fmtutil-fix-infinite-loop_upstream
-#2011# upstream # upstream-web2c-tmpfilewithpid
-#2011# upstream # cve-2010-1440
-#cve-2010-0739.patch
-#2011# upstream # cve-2010-0827.patch
-#2011# upstream # upstream-tex-file_arg-passing-fix
#partial_lfs_support.diff
-#2011# upstream # 73_tex_segfault
-#2011# not necessary anymore, different fix upstream # unstymie-xetex-with-zlib-1.2.6.patch
debian-no-linked-scripts
build-wovp2ovf
60_unneeded_linking
61_path_max.diff
-#dvipdfmx-config-i-directive
-#xdvipdfmx-config-i-directive
pmpost-20120415-tl11.diff
pmpost-svg-20120119-tl11.diff
#xdvi-zoom-with-eps-figures.patch
diff --git a/debian/patches/unstymie-xetex-with-zlib-1.2.6.patch b/debian/patches/unstymie-xetex-with-zlib-1.2.6.patch
deleted file mode 100644
index d368a74..0000000
--- a/debian/patches/unstymie-xetex-with-zlib-1.2.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-zlib 1.2.6 changed the semantics of gzeof function which breaks xetex
-and probably other programs (good move for a minor version upgrade!)
-This patch was made by Dan Ports to fix xetex
----
- texk/web2c/xetexdir/xetex.ch | 1 -
- 1 file changed, 1 deletion(-)
-
-Index: texlive-bin-2009/texk/web2c/xetexdir/xetex.ch
-===================================================================
---- texlive-bin-2009.orig/texk/web2c/xetexdir/xetex.ch 2012-02-14 08:12:16.892244044 +0900
-+++ texlive-bin-2009/texk/web2c/xetexdir/xetex.ch 2012-02-14 08:12:17.600244497 +0900
-@@ -6951,7 +6951,6 @@
- @y
- undump_int(x);
- if (x<>69069) then goto bad_fmt;
--if not w_eof(fmt_file) then goto bad_fmt
- @z
-
- @x
diff --git a/debian/patches/upstream-tex-file_arg-passing-fix b/debian/patches/upstream-tex-file_arg-passing-fix
deleted file mode 100644
index 14211b3..0000000
--- a/debian/patches/upstream-tex-file_arg-passing-fix
+++ /dev/null
@@ -1,70 +0,0 @@
-Fix for Debian bug 602566
-patch by Mathias Kende include upstream
-> The bug seems to come from libkpathsea5 and not from dvi2ps. It exists
-> on all platforms (at least also on AMD64) but does not trigger a
-> segfault. It comes from the kpse_set_suffixes function in the
-> libkpathsea compatibility API which calls the kpathsea_set_suffixes
-> function and passes to it its variable list of arguments. This operation
-> is invalid in C.
----
- texk/kpathsea/tex-file.c | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-Index: texlive-bin-2009/texk/kpathsea/tex-file.c
-===================================================================
---- texlive-bin-2009.orig/texk/kpathsea/tex-file.c 2010-11-10 10:56:14.000000000 +0900
-+++ texlive-bin-2009/texk/kpathsea/tex-file.c 2010-11-10 10:56:28.000000000 +0900
-@@ -321,14 +321,13 @@
- /* Some file types have more than one suffix, and sometimes it is
- convenient to modify the list of searched suffixes. */
-
--void
--kpathsea_set_suffixes (kpathsea kpse, kpse_file_format_type format,
-- boolean alternate, ...)
-+static void
-+kpathsea_set_suffixes_va_list(kpathsea kpse, kpse_file_format_type format,
-+ boolean alternate, va_list ap)
- {
- const_string **list;
- const_string s;
- int count = 0;
-- va_list ap;
-
- if (alternate) {
- list = &(kpse->format_info[format].alt_suffix);
-@@ -336,16 +335,24 @@
- list = &(kpse->format_info[format].suffix);
- }
-
-- va_start (ap, alternate);
- while ((s = va_arg (ap, string)) != NULL) {
- count++;
- XRETALLOC (*list, count + 1, const_string);
- (*list)[count - 1] = s;
- }
-- va_end (ap);
- (*list)[count] = NULL;
- }
-
-+void
-+kpathsea_set_suffixes (kpathsea kpse, kpse_file_format_type format,
-+ boolean alternate, ...)
-+{
-+ va_list ap;
-+ va_start (ap, alternate);
-+ kpathsea_set_suffixes_va_list (kpse, format, alternate, ap);
-+ va_end (ap);
-+}
-+
-
- #if defined (KPSE_COMPAT_API)
- void
-@@ -354,7 +361,7 @@
- {
- va_list ap;
- va_start (ap, alternate);
-- kpathsea_set_suffixes (kpse_def, format, alternate, ap);
-+ kpathsea_set_suffixes_va_list (kpse_def, format, alternate, ap);
- va_end (ap);
- }
- #endif
diff --git a/debian/patches/upstream-web2c-tmpfilewithpid b/debian/patches/upstream-web2c-tmpfilewithpid
deleted file mode 100644
index 4482cd3..0000000
--- a/debian/patches/upstream-web2c-tmpfilewithpid
+++ /dev/null
@@ -1,33 +0,0 @@
-See comments in the diff for explanations
----
- texk/web2c/lib/openclose.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-Index: texlive-bin-2009/texk/web2c/lib/openclose.c
-===================================================================
---- texlive-bin-2009.orig/texk/web2c/lib/openclose.c 2010-03-30 22:15:52.000000000 +0900
-+++ texlive-bin-2009/texk/web2c/lib/openclose.c 2010-03-30 22:17:20.000000000 +0900
-@@ -37,12 +37,19 @@
- static void
- recorder_start(void)
- {
-- /* Alas, while we might want to use mkstemp it is not portable.
-- So we have to be content with using a default name... */
-+ /* Alas, while we'd like to use mkstemp it is not portable,
-+ and doing the autoconfiscation (and providing fallbacks) is more
-+ than we want to cope with. So we have to be content with using a
-+ default name. Throw in the pid so at least parallel builds might
-+ work (Debian bug 575731). */
- string cwd;
--
-- recorder_name = (string)xmalloc(strlen(kpse_program_name)+5);
-+ pid_t pid = getpid();
-+ char pid_str[MAX_INT_LENGTH];
-+ sprintf (pid_str, "%ld", (long) pid);
-+
-+ recorder_name = (string)xmalloc(strlen(kpse_program_name) + strlen(pid_str) + 5);
- strcpy(recorder_name, kpse_program_name);
-+ strcat(recorder_name, pid_str);
- strcat(recorder_name, ".fls");
-
- /* If an output directory was specified, use it instead of cwd. */
diff --git a/debian/patches/xdvipdfmx-config-i-directive b/debian/patches/xdvipdfmx-config-i-directive
deleted file mode 100644
index 4b87083..0000000
--- a/debian/patches/xdvipdfmx-config-i-directive
+++ /dev/null
@@ -1,41 +0,0 @@
----
- texk/xdvipdfmx/data/config/dvipdfmx.cfg | 2 ++
- texk/xdvipdfmx/src/dvipdfmx.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-Index: texlive-bin-2011.20120408/texk/xdvipdfmx/data/config/dvipdfmx.cfg
-===================================================================
---- texlive-bin-2011.20120408.orig/texk/xdvipdfmx/data/config/dvipdfmx.cfg 2012-04-08 21:41:48.165582350 +0900
-+++ texlive-bin-2011.20120408/texk/xdvipdfmx/data/config/dvipdfmx.cfg 2012-04-08 21:42:29.217810690 +0900
-@@ -183,3 +183,5 @@
- %% Put additonal fontmap files here
- f cid-x.map
-
-+%% Include additional config files
-+%i <filename>
-Index: texlive-bin-2011.20120408/texk/xdvipdfmx/src/dvipdfmx.c
-===================================================================
---- texlive-bin-2011.20120408.orig/texk/xdvipdfmx/src/dvipdfmx.c 2012-04-08 21:41:48.165582350 +0900
-+++ texlive-bin-2011.20120408/texk/xdvipdfmx/src/dvipdfmx.c 2012-04-08 21:42:29.217810690 +0900
-@@ -107,6 +107,9 @@
- char *dvi_filename = NULL, *pdf_filename = NULL;
-
- static void
-+read_config_file (const char *config);
-+
-+static void
- set_default_pdf_filename(void)
- {
- const char *dvi_base;
-@@ -455,6 +458,11 @@
- pdf_load_fontmap_file(argv[1], FONTMAP_RMODE_REPLACE);
- POP_ARG();
- break;
-+ case 'i':
-+ CHECK_ARG(1, "subsidiary config file");
-+ read_config_file(argv[1]);
-+ POP_ARG();
-+ break;
- case 'e':
- WARN("dvipdfm \"-e\" option not supported.");
- break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git
More information about the Reproducible-commits
mailing list