pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/luatex luatex: update to 1.07.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c8e7a6a5140
branches: trunk
changeset: 307790:2c8e7a6a5140
user: markd <markd%pkgsrc.org@localhost>
date: Sun May 13 12:46:27 2018 +0000
description:
luatex: update to 1.07.0
texlive 2018 version
diffstat:
print/luatex/Makefile | 11 +-
print/luatex/distinfo | 17 +-
print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w | 234 +----
print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc | 465 +---------
print/luatex/patches/patch-texk_web2c_luatexdir_lua_lpdfscannerlib.cc | 15 -
print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ctype.c | 16 -
print/luatex/patches/patch-texk_web2c_luatexdir_luaffi_ffi.h | 14 -
7 files changed, 50 insertions(+), 722 deletions(-)
diffs (truncated from 829 to 300 lines):
diff -r 9f022e29c93f -r 2c8e7a6a5140 print/luatex/Makefile
--- a/print/luatex/Makefile Sun May 13 12:39:23 2018 +0000
+++ b/print/luatex/Makefile Sun May 13 12:46:27 2018 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2018/04/28 20:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2018/05/13 12:46:27 markd Exp $
-DISTNAME= texlive-20170524-source
-PKGNAME= luatex-1.0.4
-PKGREVISION= 11
+DISTNAME= texlive-20180414-source
+PKGNAME= luatex-1.07.0
CATEGORIES= print
-MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/
+MASTER_SITES= ftp://tug.org/historic/systems/texlive/2018/
EXTRACT_SUFX= .tar.xz
MAINTAINER= minskim%NetBSD.org@localhost
@@ -24,7 +23,7 @@
CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \
--enable-luatex --disable-mf --disable-mf-nowin \
--with-x=no \
- --disable-luajittex --disable-mfluajit \
+ --disable-luatex53 --disable-luajittex --disable-mfluajit \
--disable-mp --disable-pmp --disable-upmp \
--disable-ptex --disable-eptex --disable-uptex --disable-euptex \
--disable-web-progs \
diff -r 9f022e29c93f -r 2c8e7a6a5140 print/luatex/distinfo
--- a/print/luatex/distinfo Sun May 13 12:39:23 2018 +0000
+++ b/print/luatex/distinfo Sun May 13 12:46:27 2018 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.29 2018/04/29 20:57:26 ryoon Exp $
+$NetBSD: distinfo,v 1.30 2018/05/13 12:46:27 markd Exp $
-SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
-RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
-SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-Size (texlive-20170524-source.tar.xz) = 63483372 bytes
+SHA1 (texlive-20180414-source.tar.xz) = 81bdd9999b6ab860d1d3c388cf27062aba960255
+RMD160 (texlive-20180414-source.tar.xz) = 0ff63bbd7f8a0fb6417089f5d1ae1e4124a1dd95
+SHA512 (texlive-20180414-source.tar.xz) = ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140
+Size (texlive-20180414-source.tar.xz) = 49770944 bytes
SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
-SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = ef0950aeeba70fdb286835dd5eab85555fd1131a
-SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 0758888fd2bf23e339a858fdde84c0aa111a7350
-SHA1 (patch-texk_web2c_luatexdir_lua_lpdfscannerlib.cc) = ddb11816de22cc7b3f286b3a7838dcf6debbf892
-SHA1 (patch-texk_web2c_luatexdir_luaffi_ctype.c) = 57d51564d5dd0200be10154216158fe801d7c630
-SHA1 (patch-texk_web2c_luatexdir_luaffi_ffi.h) = 2fbf91152fc3438d8e989d5f5f95877faaec6790
+SHA1 (patch-texk_web2c_luatexdir_image_pdftoepdf.w) = 9b6d637abe2fbb246a2435caf8aec5070abd1c5f
+SHA1 (patch-texk_web2c_luatexdir_lua_lepdflib.cc) = 24052cbff1a087badbeefe8b58bf7ce97e4ab4fb
diff -r 9f022e29c93f -r 2c8e7a6a5140 print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w Sun May 13 12:39:23 2018 +0000
+++ b/print/luatex/patches/patch-texk_web2c_luatexdir_image_pdftoepdf.w Sun May 13 12:46:27 2018 +0000
@@ -1,217 +1,27 @@
-$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.4 2018/04/29 20:57:26 ryoon Exp $
+$NetBSD: patch-texk_web2c_luatexdir_image_pdftoepdf.w,v 1.5 2018/05/13 12:46:27 markd Exp $
-The ctangle tex-to-C generator strips whitespace, resulting in "C++11 requires
-a space between literal and identifier" failures. Pull in hacky patch from
-Gentoo which avoids this problem by using newlines.
+Build with poppler 0.64
-Add support for newer poppler's from ArchLinux
-
---- texk/web2c/luatexdir/image/pdftoepdf.w.orig 2016-11-25 18:09:14.000000000 +0000
+--- texk/web2c/luatexdir/image/pdftoepdf.w.orig 2018-01-17 18:00:12.000000000 +0000
+++ texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -71,7 +71,11 @@ static char *get_file_checksum(const cha
- ck = (char *) malloc(PDF_CHECKSUM_SIZE);
- if (ck == NULL)
- formatted_error("pdf inclusion","out of memory while processing '%s'", a);
-- snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,(uint64_t) mtime);
-+ snprintf(ck, PDF_CHECKSUM_SIZE, "%"
-+PRIu64
-+"_%"
-+PRIu64
-+, (uint64_t) size,(uint64_t) mtime);
- } else {
- switch (fe) {
- case FE_FAIL:
-@@ -224,7 +228,7 @@ PdfDocument *refMemStreamPdfDocument(cha
- free(checksum);
- }
- if (pdf_doc->doc == NULL) {
-- docmemstream = new MemStream( docstream,0,streamsize, obj.initNull() );
-+ docmemstream = new MemStream( docstream,0,streamsize, Object(objNull) );
- doc = new PDFDoc(docmemstream); /* takes ownership of docmemstream */
- pdf_doc->pc++;
- if (!doc->isOk() || !doc->okToPrint()) {
-@@ -408,9 +412,8 @@ static void copyArray(PDF pdf, PdfDocume
- Object obj1;
- pdf_begin_array(pdf);
- for (i = 0, l = array->getLength(); i < l; ++i) {
-- array->getNF(i, &obj1);
-+ obj1 = array->getNF(i);
- copyObject(pdf, pdf_doc, &obj1);
-- obj1.free();
- }
- pdf_end_array(pdf);
- }
-@@ -422,9 +425,8 @@ static void copyDict(PDF pdf, PdfDocumen
- pdf_begin_dict(pdf);
- for (i = 0, l = dict->getLength(); i < l; ++i) {
- copyName(pdf, dict->getKey(i));
-- dict->getValNF(i, &obj1);
-+ obj1 = dict->getValNF(i);
- copyObject(pdf, pdf_doc, &obj1);
-- obj1.free();
- }
- pdf_end_dict(pdf);
+@@ -361,9 +361,9 @@ void copyReal(PDF pdf, double d)
+ pdf->cave = true;
}
-@@ -470,10 +472,10 @@ static void copyObject(PDF pdf, PdfDocum
- break;
- */
- case objString:
-- copyString(pdf, obj->getString());
-+ copyString(pdf, const_cast<GooString*>(obj->getString()));
- break;
- case objName:
-- copyName(pdf, obj->getName());
-+ copyName(pdf, const_cast<char*>(obj->getName()));
- break;
- case objNull:
- pdf_add_null(pdf);
-@@ -510,13 +512,12 @@ static void writeRefs(PDF pdf, PdfDocume
- PDFDoc *doc = pdf_doc->doc;
- xref = doc->getXRef();
- for (r = pdf_doc->inObjList; r != NULL;) {
-- xref->fetch(r->ref.num, r->ref.gen, &obj1);
-+ obj1 = xref->fetch(r->ref.num, r->ref.gen);
- if (obj1.isStream())
- pdf_begin_obj(pdf, r->num, OBJSTM_NEVER);
- else
- pdf_begin_obj(pdf, r->num, 2);
- copyObject(pdf, pdf_doc, &obj1);
-- obj1.free();
- pdf_end_obj(pdf);
- n = r->next;
- delete r;
-@@ -740,7 +741,7 @@ void write_epdf(PDF pdf, image_dict * id
- catalog = doc->getCatalog();
- page = catalog->getPage(img_pagenum(idict));
- pageref = catalog->getPageRef(img_pagenum(idict));
-- doc->getXRef()->fetch(pageref->num, pageref->gen, &pageobj);
-+ pageobj = doc->getXRef()->fetch(pageref->num, pageref->gen);
- pageDict = pageobj.getDict();
- /* write the Page header */
- pdf_begin_obj(pdf, img_objnum(idict), OBJSTM_NEVER);
-@@ -757,12 +758,11 @@ void write_epdf(PDF pdf, image_dict * id
- pdf_dict_add_int(pdf, "PTEX.PageNumber", (int) img_pagenum(idict));
- }
- if ((suppress_optional_info & 8) == 0) {
-- doc->getDocInfoNF(&obj1);
-+ obj1 = doc->getDocInfoNF();
- if (obj1.isRef()) {
- /* the info dict must be indirect (PDF Ref p. 61) */
- pdf_dict_add_ref(pdf, "PTEX.InfoDict", addInObj(pdf, pdf_doc, obj1.getRef()));
- }
-- obj1.free();
- }
- if (img_is_bbox(idict)) {
- bbox[0] = sp2bp(img_bbox(idict)[0]);
-@@ -788,19 +788,17 @@ void write_epdf(PDF pdf, image_dict * id
- Now all relevant parts of the Page dictionary are copied. Metadata validity
- check is needed(as a stream it must be indirect).
- */
-- pageDict->lookupNF("Metadata", &obj1);
-+ obj1 = pageDict->lookupNF("Metadata");
- if (!obj1.isNull() && !obj1.isRef())
- formatted_warning("pdf inclusion","/Metadata must be indirect object");
-- obj1.free();
- /* copy selected items in Page dictionary */
- for (i = 0; pagedictkeys[i] != NULL; i++) {
-- pageDict->lookupNF(pagedictkeys[i], &obj1);
-+ obj1 = pageDict->lookupNF(pagedictkeys[i]);
- if (!obj1.isNull()) {
- pdf_add_name(pdf, pagedictkeys[i]);
- /* preserves indirection */
- copyObject(pdf, pdf_doc, &obj1);
- }
-- obj1.free();
- }
- /*
- If there are no Resources in the Page dict of the embedded page,
-@@ -808,32 +806,28 @@ void write_epdf(PDF pdf, image_dict * id
- PDF file, climbing up the tree until the Resources are found.
- (This fixes a problem with Scribus 1.3.3.14.)
- */
-- pageDict->lookupNF("Resources", &obj1);
-+ obj1 = pageDict->lookupNF("Resources");
- if (obj1.isNull()) {
- op1 = &pagesobj1;
- op2 = &pagesobj2;
-- pageDict->lookup("Parent", op1);
-+ *op1 = pageDict->lookup("Parent");
- while (op1->isDict()) {
-- obj1.free();
-- op1->dictLookupNF("Resources", &obj1);
-+ obj1 = op1->dictLookupNF("Resources");
- if (!obj1.isNull()) {
- pdf_add_name(pdf, "Resources");
- copyObject(pdf, pdf_doc, &obj1);
- break;
- }
-- op1->dictLookup("Parent", op2);
-+ *op2 = op1->dictLookup("Parent");
- optmp = op1;
- op1 = op2;
- op2 = optmp;
-- op2->free();
- };
- if (!op1->isDict())
- formatted_warning("pdf inclusion","Page /Resources missing");
-- op1->free();
- }
-- obj1.free();
- /* Write the Page contents. */
-- page->getContents(&contents);
-+ contents = page->getContents();
- if (contents.isStream()) {
- /*
- Variant A: get stream and recompress under control of \pdfcompresslevel
-@@ -844,27 +838,23 @@ void write_epdf(PDF pdf, image_dict * id
- Variant B: copy stream without recompressing
- */
-- contents.streamGetDict()->lookup("F", &obj1);
-+ obj1 = contents.streamGetDict()->lookup("F");
- if (!obj1.isNull()) {
- normal_error("pdf inclusion","unsupported external stream");
- }
-- obj1.free();
-- contents.streamGetDict()->lookup("Length", &obj1);
-+ obj1 = contents.streamGetDict()->lookup("Length");
- pdf_add_name(pdf, "Length");
- copyObject(pdf, pdf_doc, &obj1);
-- obj1.free();
-- contents.streamGetDict()->lookup("Filter", &obj1);
-+ obj1 = contents.streamGetDict()->lookup("Filter");
- if (!obj1.isNull()) {
- pdf_add_name(pdf, "Filter");
- copyObject(pdf, pdf_doc, &obj1);
-- obj1.free();
-- contents.streamGetDict()->lookup("DecodeParms", &obj1);
-+ obj1 = contents.streamGetDict()->lookup("DecodeParms");
- if (!obj1.isNull()) {
- pdf_add_name(pdf, "DecodeParms");
- copyObject(pdf, pdf_doc, &obj1);
- }
- }
-- obj1.free();
- pdf_end_dict(pdf);
- pdf_begin_stream(pdf);
- copyStreamStream(pdf, contents.getStream()->getUndecodedStream());
-@@ -875,8 +865,8 @@ void write_epdf(PDF pdf, image_dict * id
- pdf_end_dict(pdf);
- pdf_begin_stream(pdf);
- for (i = 0, l = contents.arrayGetLength(); i < l; ++i) {
-- copyStreamStream(pdf, (contents.arrayGet(i, &obj1))->getStream());
-- obj1.free();
-+ obj1 = contents.arrayGet(i);
-+ copyStreamStream(pdf, obj1.getStream());
- if (i < (l - 1)) {
- /*
- Put a space between streams to be on the safe side (streams
-@@ -897,8 +887,6 @@ void write_epdf(PDF pdf, image_dict * id
- }
- /* write out all indirect objects */
- writeRefs(pdf, pdf_doc);
-- contents.free();
-- pageobj.free();
- /*
- unrefPdfDocument() must come after contents.free() and pageobj.free()!
- TH: The next line makes repeated pdf inclusion unacceptably slow
+-static void copyString(PDF pdf, GooString * string)
++static void copyString(PDF pdf, const GooString * string)
+ {
+- char *p;
++ const char *p;
+ unsigned char c;
+ size_t i, l;
+ p = string->getCString();
+@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooStrin
+ pdf->cave = true;
+ }
+
+-static void copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+ pdf_out(pdf, '/');
+ for (; *s != 0; s++) {
diff -r 9f022e29c93f -r 2c8e7a6a5140 print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc
--- a/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc Sun May 13 12:39:23 2018 +0000
+++ b/print/luatex/patches/patch-texk_web2c_luatexdir_lua_lepdflib.cc Sun May 13 12:46:27 2018 +0000
@@ -1,457 +1,24 @@
-$NetBSD: patch-texk_web2c_luatexdir_lua_lepdflib.cc,v 1.4 2018/04/29 20:57:26 ryoon Exp $
Home |
Main Index |
Thread Index |
Old Index