Re: alpha building reborn - texlive-bin breakage poppler help
On Mit, 31 Jan 2007, Norbert Preining wrote:
> On Mit, 31 Jan 2007, Frank Küster wrote:
> > Nope, xetex is missing a libpoppler patch and suffers from my changing
> > of $needs_xpdf to false for everything.
>
> GOT IT COMPILED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Here is the diff, it disables also pdftosrc building ... I hope I didn't
forget anything, compile is running ...
No idea whether the whole bunch of includes is necessary, but I decided
to not test it for now ;-)
--- ./build/source/texk/web2c/pdftexdir/pdftex.mk.orig 2007-01-31 19:01:15.000000000 +0100
+++ ./build/source/texk/web2c/pdftexdir/pdftex.mk 2007-01-31 19:00:33.000000000 +0100
@@ -156,7 +156,7 @@
rm -f ttf2afm.c macnames.c
#
# pdftosrc
-pdftosrc = pdftosrc
+pdftosrc =
pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS)
--- ./build/source/texk/web2c/xetexdir/pdfimage.cpp.orig 2006-12-09 11:29:12.000000000 +0100
+++ ./build/source/texk/web2c/xetexdir/pdfimage.cpp 2007-01-31 18:59:47.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"
@@ -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) {
--- ./build/source/texk/web2c/xetexdir/XeTeX_ext.c.orig 2007-01-15 14:04:36.000000000 +0100
+++ ./build/source/texk/web2c/xetexdir/XeTeX_ext.c 2007-01-31 18:59:47.000000000 +0100
@@ -33,7 +33,7 @@
*/
#ifdef XETEX_OTHER
-#include "xpdf/config.h"
+#include "poppler/poppler-config.h"
#include "png.h"
#endif
--- ./build/source/texk/web2c/xetexdir/xetex.mk.orig 2007-01-31 19:02:24.000000000 +0100
+++ ./build/source/texk/web2c/xetexdir/xetex.mk 2007-01-31 19:02:07.000000000 +0100
@@ -81,7 +81,7 @@
FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
FONTCONFIGLDFLAGS = @FONTCONFIGLDFLAGS@
-xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDZLIB)
+xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDZLIB) -lpoppler
# Font-related headers
XeTeXFontHdrs = \
Best wishes
Norbert
-------------------------------------------------------------------------------
Dr. Norbert Preining <preining@logic.at> Università di Siena
Debian Developer <preining@debian.org> Debian TeX Group
gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
GLAZELEY (adj.)
The state of a barrister's flat greasy hair after wearing a wig all
day.
--- Douglas Adams, The Meaning of Liff
Reply to: