pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/web2c
Module Name: pkgsrc
Committed By: ryoon
Date: Tue Dec 4 13:01:44 UTC 2018
Modified Files:
pkgsrc/print/web2c: distinfo
pkgsrc/print/web2c/patches: patch-pdftexdir_pdftoepdf-newpoppler.cc
patch-pdftexdir_pdftosrc-newpoppler.cc
Added Files:
pkgsrc/print/web2c/patches: patch-pdftexdir_pdftex-common.h
patch-pdftexdir_writeenc.c
Log Message:
FIx build with poppler-0.71
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/web2c/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/print/web2c/patches/patch-pdftexdir_pdftex-common.h \
pkgsrc/print/web2c/patches/patch-pdftexdir_writeenc.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc \
pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/web2c/distinfo
diff -u pkgsrc/print/web2c/distinfo:1.28 pkgsrc/print/web2c/distinfo:1.29
--- pkgsrc/print/web2c/distinfo:1.28 Thu Nov 1 11:02:34 2018
+++ pkgsrc/print/web2c/distinfo Tue Dec 4 13:01:44 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2018/11/01 11:02:34 markd Exp $
+$NetBSD: distinfo,v 1.29 2018/12/04 13:01:44 ryoon Exp $
SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
@@ -6,6 +6,8 @@ SHA512 (texlive-20180414-source.tar.xz)
Size (texlive-20180414-source.tar.xz) = 49770944 bytes
SHA1 (patch-Makefile.in) = 28e7ad00f3796b49f92c5cc3eb3c94bdf38b1364
SHA1 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
-SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = 6d778c1b493d1f498c07ea49a41a9f15d3f8d570
-SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 6601ac14720cc36321d3da70359218182f98915b
+SHA1 (patch-pdftexdir_pdftex-common.h) = 59f32828de5dd032307467d83e43f21382a39330
+SHA1 (patch-pdftexdir_pdftoepdf-newpoppler.cc) = a2a177c8ad40fe0fce1b8cb88703e01b995eac97
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = 720471f420cbf1caf241e84be233e51c9237e8a3
+SHA1 (patch-pdftexdir_writeenc.c) = daf41fec97d3d3e46063d8cf4c559d96e1ec69bf
SHA1 (patch-pdftexdir_writet1.c) = 7d00d5d5d3f884bc1f9946cb3fbcaa7f224df9de
Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc
diff -u pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc:1.1 pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc:1.2
--- pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc:1.1 Sun May 13 13:01:02 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-newpoppler.cc Tue Dec 4 13:01:44 2018
@@ -1,9 +1,16 @@
-$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.1 2018/05/13 13:01:02 markd Exp $
-
-Build with poppler 0.64
+$NetBSD: patch-pdftexdir_pdftoepdf-newpoppler.cc,v 1.2 2018/12/04 13:01:44 ryoon Exp $
--- pdftexdir/pdftoepdf-newpoppler.cc.orig 2018-04-04 04:08:11.000000000 +0000
+++ pdftexdir/pdftoepdf-newpoppler.cc
+@@ -120,7 +120,7 @@ struct UsedEncoding {
+
+ static InObj *inObjList;
+ static UsedEncoding *encodingList;
+-static GBool isInit = gFalse;
++static bool isInit = false;
+
+ // --------------------------------------------------------------------
+ // Maintain list of open embedded PDF files
@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
@@ -13,6 +20,24 @@ Build with poppler 0.64
{
pdf_puts("/");
for (; *s != 0; s++) {
+@@ -310,7 +310,7 @@ static void copyDict(Object * obj)
+ static void copyFontDict(Object * obj, InObj * r)
+ {
+ int i, l;
+- char *key;
++ const char *key;
+ if (!obj->isDict())
+ pdftex_fail("PDF inclusion: invalid dict type <%s>",
+ obj->getTypeName());
+@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
+ return false;
+ }
+
+-static void copyFont(char *tag, Object * fontRef)
++static void copyFont(const char *tag, Object * fontRef)
+ {
+ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+ stemV;
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object *
&& fontdescRef.isRef()
&& fontdesc.isDict()
@@ -31,6 +56,15 @@ Build with poppler 0.64
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
+@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
+ pdf_puts(">>\n");
+ }
+
+-static void copyOtherResources(Object * obj, char *key)
++static void copyOtherResources(Object * obj, const char *key)
+ {
+ // copies all other resources (write_epdf handles Fonts and ProcSets),
+
@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
@@ -42,3 +76,72 @@ Build with poppler 0.64
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
+@@ -655,7 +655,7 @@ static void writeRefs()
+ static void writeEncodings()
+ {
+ UsedEncoding *r, *n;
+- char *glyphNames[256], *s;
++ const char *glyphNames[256], *s;
+ int i;
+ for (r = encodingList; r != 0; r = r->next) {
+ for (i = 0; i < 256; i++) {
+@@ -685,20 +685,24 @@ static void writeEncodings()
+ // get the pagebox according to the pagebox_spec
+ static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+ {
++ const PDFRectangle *ret;
++
+ if (pagebox_spec == pdfboxspecmedia)
+- return page->getMediaBox();
++ ret = page->getMediaBox();
+ else if (pagebox_spec == pdfboxspeccrop)
+- return page->getCropBox();
++ ret = page->getCropBox();
+ else if (pagebox_spec == pdfboxspecbleed)
+- return page->getBleedBox();
++ ret = page->getBleedBox();
+ else if (pagebox_spec == pdfboxspectrim)
+- return page->getTrimBox();
++ ret = page->getTrimBox();
+ else if (pagebox_spec == pdfboxspecart)
+- return page->getArtBox();
++ ret = page->getArtBox();
+ else
+ pdftex_fail("PDF inclusion: unknown value of pagebox spec (%i)",
+ (int) pagebox_spec);
+- return page->getMediaBox(); // to make the compiler happy
++ ret = page->getMediaBox(); // to make the compiler happy
++
++ return const_cast<PDFRectangle*>(ret);
+ }
+
+
+@@ -724,8 +728,8 @@ read_pdf_info(char *image_name, char *pa
+ // initialize
+ if (!isInit) {
+ globalParams = new GlobalParams();
+- globalParams->setErrQuiet(gFalse);
+- isInit = gTrue;
++ globalParams->setErrQuiet(false);
++ isInit = true;
+ }
+ // open PDF file
+ pdf_doc = find_add_document(image_name);
+@@ -822,7 +826,7 @@ void write_epdf(void)
+ Object groupDict;
+ bool writeSepGroup = false;
+ Object info;
+- char *key;
++ const char *key;
+ char s[256];
+ int i, l;
+ int rotate;
+@@ -977,7 +981,7 @@ The changes below seem to work fine.
+ }
+ l = dic1.getLength();
+ for (i = 0; i < l; i++) {
+- groupDict.dictAdd(copyString(dic1.getKey(i)),
++ groupDict.dictAdd(const_cast<const char *>(copyString(dic1.getKey(i))),
+ dic1.getValNF(i));
+ }
+ // end modification
Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc
diff -u pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc:1.1 pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc:1.2
--- pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc:1.1 Sun May 13 13:01:02 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftosrc-newpoppler.cc Tue Dec 4 13:01:44 2018
@@ -1,6 +1,4 @@
-$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.1 2018/05/13 13:01:02 markd Exp $
-
-Build with poppler 0.64
+$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.2 2018/12/04 13:01:44 ryoon Exp $
--- pdftexdir/pdftosrc-newpoppler.cc.orig 2017-10-17 21:52:13.000000000 +0000
+++ pdftexdir/pdftosrc-newpoppler.cc
@@ -13,3 +11,15 @@ Build with poppler 0.64
int objnum = 0, objgen = 0;
bool extract_xref_table = false;
int c;
+@@ -173,9 +173,9 @@ int main(int argc, char *argv[])
+
+ // parse the header: object numbers and offsets
+ objStr.streamReset();
+- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
++ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
+ lexer = new Lexer(xref, str);
+- parser = new Parser(xref, lexer, gFalse);
++ parser = new Parser(xref, lexer, false);
+ for (n = 0; n < nObjects; ++n) {
+ obj1 = parser->getObj();
+ obj2 = parser->getObj();
Added files:
Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftex-common.h
diff -u /dev/null pkgsrc/print/web2c/patches/patch-pdftexdir_pdftex-common.h:1.1
--- /dev/null Tue Dec 4 13:01:44 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftex-common.h Tue Dec 4 13:01:44 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-pdftexdir_pdftex-common.h,v 1.1 2018/12/04 13:01:44 ryoon Exp $
+
+--- pdftexdir/pdftex-common.h.orig 2016-11-25 18:24:37.000000000 +0000
++++ pdftexdir/pdftex-common.h
+@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ...
+ extern void write_epdf(void);
+
+ /* writeenc.c */
+-extern void epdf_write_enc(char **, int);
++extern void epdf_write_enc(const char **, int);
+
+ /* writeimg.c */
+ extern float epdf_width;
Index: pkgsrc/print/web2c/patches/patch-pdftexdir_writeenc.c
diff -u /dev/null pkgsrc/print/web2c/patches/patch-pdftexdir_writeenc.c:1.1
--- /dev/null Tue Dec 4 13:01:44 2018
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_writeenc.c Tue Dec 4 13:01:44 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-pdftexdir_writeenc.c,v 1.1 2018/12/04 13:01:44 ryoon Exp $
+
+--- pdftexdir/writeenc.c.orig 2016-11-25 18:24:37.000000000 +0000
++++ pdftexdir/writeenc.c
+@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s)
+
+ /**********************************************************************/
+
+-void epdf_write_enc(char **glyph_names, int fe_objnum)
++void epdf_write_enc(const char **glyph_names, int fe_objnum)
+ {
+ int i, i_old;
+ assert(glyph_names != NULL);
Home |
Main Index |
Thread Index |
Old Index