Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-tex/pdftex/files: pdftex-1.40.9-poppler.patch
Date: Wed, 03 Sep 2008 18:48:21
Message-Id: E1KaxOt-0004vz-4z@stork.gentoo.org
1 aballier 08/09/03 18:48:19
2
3 Added: pdftex-1.40.9-poppler.patch
4 Log:
5 Initial import. Standalone pdftex patched to use poppler.
6 (Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)
7
8 Revision Changes Path
9 1.1 dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tex/pdftex/files/pdftex-1.40.9-poppler.patch?rev=1.1&content-type=text/plain
13
14 Index: pdftex-1.40.9-poppler.patch
15 ===================================================================
16 Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
17 ===================================================================
18 --- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
19 +++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
20 @@ -24,8 +24,9 @@ Franklin Street, Fifth Floor, Boston, MA
21 #include <stdio.h>
22 #include <string.h>
23 #include <ctype.h>
24 -#include <aconf.h>
25 -#include <GString.h>
26 +#include <dirent.h>
27 +#include <poppler-config.h>
28 +#include <GooString.h>
29 #include <gmem.h>
30 #include <gfile.h>
31 #include <config.h>
32 @@ -159,7 +160,7 @@ static PdfDocument *find_add_document(ch
33 fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
34 p->occurences);
35 #endif
36 - GString *docName = new GString(p->file_name);
37 + GooString *docName = new GooString(p->file_name);
38 p->doc = new PDFDoc(docName); // takes ownership of docName
39 if (!p->doc->isOk() || !p->doc->okToPrint()) {
40 pdftex_fail("xpdf: reading PDF image failed");
41 @@ -520,7 +521,7 @@ static void copyObject(Object * obj)
42 int i, l, c;
43 Ref ref;
44 char *p;
45 - GString *s;
46 + GooString *s;
47 if (obj->isBool()) {
48 pdf_printf("%s", obj->getBool()? "true" : "false");
49 } else if (obj->isInt()) {
50 @@ -713,7 +714,7 @@ read_pdf_info(char *image_name, char *pa
51 epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
52 if (page_name) {
53 // get page by name
54 - GString name(page_name);
55 + GooString name(page_name);
56 LinkDest *link = pdf_doc->doc->findDest(&name);
57 if (link == 0 || !link->isOk())
58 pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
59 Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
60 ===================================================================
61 --- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/utils.c
62 +++ pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
63 @@ -35,7 +35,7 @@ Franklin Street, Fifth Floor, Boston, MA
64 #include "zlib.h"
65 #include "ptexlib.h"
66 #include "png.h"
67 -#include "xpdf/config.h" /* just to get the xpdf version */
68 +#include <poppler/poppler-config.h> /* just to get the poppler version */
69
70 static const char _svn_version[] =
71 "$Id: pdftex-1.40.9-poppler.patch,v 1.1 2008/09/03 18:48:18 aballier Exp $ $URL: svn://192.168.0.1/svnroot/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
72 @@ -1267,7 +1267,7 @@ void initversionstring(char **versions)
73 (void) asprintf(versions,
74 "Compiled with libpng %s; using libpng %s\n"
75 "Compiled with zlib %s; using zlib %s\n"
76 - "Compiled with xpdf version %s\n",
77 + "Compiled with poppler version %s\n",
78 PNG_LIBPNG_VER_STRING, png_libpng_ver,
79 ZLIB_VERSION, zlib_version, xpdfVersion);
80 }