* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-11 13:30 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-11 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 130f081fc202267abd1de41e986b0be23ffca3f7
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 13:29:33 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 13:29:33 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=130f081f
Add poppler-0.87 compat patch (texlive-core-2020)
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
2020/patches/texlive-core-2020-poppler087.patch | 793 ++++++++++++++++++++++++
1 file changed, 793 insertions(+)
diff --git a/2020/patches/texlive-core-2020-poppler087.patch b/2020/patches/texlive-core-2020-poppler087.patch
new file mode 100644
index 0000000..46e1554
--- /dev/null
+++ b/2020/patches/texlive-core-2020-poppler087.patch
@@ -0,0 +1,793 @@
+From 8d64d7b03196d7341975921a926aae5eb98f3a12 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sat, 11 Apr 2020 15:57:22 +0300
+Subject: [PATCH] add poppler 0.87 compat
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/web2c/pdftexdir/pdftoepdf.cc | 306 +++++++++++++++---------------
+ texk/web2c/pdftexdir/pdftosrc.cc | 70 +++----
+ 2 files changed, 184 insertions(+), 192 deletions(-)
+
+diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
+index 4242ce3e..b9cdf38e 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -1,5 +1,5 @@
+ /*
+-Copyright 1996-2016 Han The Thanh, <thanh@pdftex.org>
++Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
+
+ This file is part of pdfTeX.
+
+@@ -17,6 +17,15 @@ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++/*
++This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
++https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
++by Arch Linux. A little modifications are made to avoid a crash for
++some kind of pdf images, such as figure_missing.pdf in gnuplot.
++The poppler should be 0.86.0 or newer versions.
++POPPLER_VERSION should be defined.
++*/
++
+ /* Do this early in order to avoid a conflict between
+ MINGW32 <rpcndr.h> defining 'boolean' as 'unsigned char' and
+ <kpathsea/types.h> defining Pascal's boolean as 'int'.
+@@ -39,10 +48,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <goo/gfile.h>
+ #define GString GooString
+ #else
+-#include <aconf.h>
+-#include <GString.h>
+-#include <gmem.h>
+-#include <gfile.h>
++#error POPPLER_VERSION should be defined.
+ #endif
+ #include <assert.h>
+
+@@ -84,31 +90,6 @@ extern integer zround(double);
+ #define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04
+ #define MASK_SUPPRESS_PTEX_INFODICT 0x08
+
+-// PdfObject encapsulates the xpdf Object type,
+-// and properly frees its resources on destruction.
+-// Use obj-> to access members of the Object,
+-// and &obj to get a pointer to the object.
+-// It is no longer necessary to call Object::free explicitely.
+-
+-class PdfObject {
+- public:
+- PdfObject() { // nothing
+- } ~PdfObject() {
+- iObject.free();
+- }
+- Object *operator->() {
+- return &iObject;
+- }
+- Object *operator&() {
+- return &iObject;
+- }
+- private: // no copying or assigning
+- PdfObject(const PdfObject &);
+- void operator=(const PdfObject &);
+- public:
+- Object iObject;
+-};
+-
+ // When copying the Resources of the selected page, all objects are copied
+ // recusively top-down. Indirect objects however are not fetched during
+ // copying, but get a new object number from pdfTeX and then will be
+@@ -139,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
+@@ -212,18 +193,6 @@ static void delete_document(PdfDocument * pdf_doc)
+ delete pdf_doc;
+ }
+
+-// Replacement for
+-// Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; }
+-
+-static void initDictFromDict(PdfObject & obj, Dict * dict)
+-{
+- obj->initDict(xref);
+- for (int i = 0, l = dict->getLength(); i < l; i++) {
+- Object obj1;
+- obj->dictAdd(copyString(dict->getKey(i)), dict->getValNF(i, &obj1));
+- }
+-}
+-
+ // --------------------------------------------------------------------
+
+ static int addEncoding(GfxFont * gfont)
+@@ -320,10 +289,10 @@ static void copyName(char *s)
+
+ static void copyDictEntry(Object * obj, int i)
+ {
+- PdfObject obj1;
+- copyName(obj->dictGetKey(i));
++ Object obj1;
++ copyName((char *)obj->dictGetKey(i));
+ pdf_puts(" ");
+- obj->dictGetValNF(i, &obj1);
++ obj1 = obj->dictGetValNF(i).copy();
+ copyObject(&obj1);
+ pdf_puts("\n");
+ }
+@@ -348,7 +317,7 @@ static void copyFontDict(Object * obj, InObj * r)
+ pdf_puts("<<\n");
+ assert(r->type == objFont); // FontDescriptor is in fd_tree
+ for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
+- key = obj->dictGetKey(i);
++ key = (char *)obj->dictGetKey(i);
+ if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0
+ || strncmp("BaseFont", key, strlen("BaseFont")) == 0
+ || strncmp("Encoding", key, strlen("Encoding")) == 0)
+@@ -376,17 +345,17 @@ static void copyStream(Stream * str)
+ static void copyProcSet(Object * obj)
+ {
+ int i, l;
+- PdfObject procset;
++ Object procset;
+ if (!obj->isArray())
+ pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>",
+ obj->getTypeName());
+ pdf_puts("/ProcSet [ ");
+ for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+- obj->arrayGetNF(i, &procset);
+- if (!procset->isName())
++ procset = obj->arrayGetNF(i).copy();
++ if (!procset.isName())
+ pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+- procset->getTypeName());
+- copyName(procset->getName());
++ procset.getTypeName());
++ copyName((char *)procset.getName());
+ pdf_puts(" ");
+ }
+ pdf_puts("]\n");
+@@ -394,10 +363,29 @@ static void copyProcSet(Object * obj)
+
+ #define REPLACE_TYPE1C true
+
++static bool embeddableFont(Object * fontdesc)
++{
++ Object fontfile, ffsubtype;
++
++ if (!fontdesc->isDict())
++ return false;
++ fontfile = fontdesc->dictLookup("FontFile");
++ if (fontfile.isStream())
++ return true;
++ if (REPLACE_TYPE1C) {
++ fontfile = fontdesc->dictLookup("FontFile3");
++ if (!fontfile.isStream())
++ return false;
++ ffsubtype = fontfile.streamGetDict()->lookup("Subtype");
++ return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C");
++ }
++ return false;
++}
++
+ static void copyFont(char *tag, Object * fontRef)
+ {
+- PdfObject fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+- fontfile, ffsubtype, stemV;
++ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
++ stemV;
+ GfxFont *gfont;
+ fd_entry *fd;
+ fm_entry *fontmap;
+@@ -413,33 +401,39 @@ static void copyFont(char *tag, Object * fontRef)
+ }
+ // Only handle included Type1 (and Type1C) fonts; anything else will be copied.
+ // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true.
+- if (!fixedinclusioncopyfont && fontRef->fetch(xref, &fontdict)->isDict()
+- && fontdict->dictLookup("Subtype", &subtype)->isName()
+- && !strcmp(subtype->getName(), "Type1")
+- && fontdict->dictLookup("BaseFont", &basefont)->isName()
+- && fontdict->dictLookupNF("FontDescriptor", &fontdescRef)->isRef()
+- && fontdescRef->fetch(xref, &fontdesc)->isDict()
+- && (fontdesc->dictLookup("FontFile", &fontfile)->isStream()
+- || (REPLACE_TYPE1C
+- && fontdesc->dictLookup("FontFile3", &fontfile)->isStream()
+- && fontfile->streamGetDict()->lookup("Subtype",
+- &ffsubtype)->isName()
+- && !strcmp(ffsubtype->getName(), "Type1C")))
+- && (fontmap = lookup_fontmap(basefont->getName())) != NULL) {
++ fontdict = fontRef->fetch(xref);
++ fontdesc = Object(objNull);
++ if (fontdict.isDict()) {
++ subtype = fontdict.dictLookup("Subtype");
++ basefont = fontdict.dictLookup("BaseFont");
++ fontdescRef = fontdict.dictLookupNF("FontDescriptor").copy();
++ if (fontdescRef.isRef()) {
++ fontdesc = fontdescRef.fetch(xref);
++ }
++ }
++ if (!fixedinclusioncopyfont && fontdict.isDict()
++ && subtype.isName()
++ && !strcmp(subtype.getName(), "Type1")
++ && basefont.isName()
++ && fontdescRef.isRef()
++ && fontdesc.isDict()
++ && embeddableFont(&fontdesc)
++ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+ // round /StemV value, since the PDF input is a float
+ // (see Font Descriptors in PDF reference), but we only store an
+ // integer, since we don't want to change the struct.
+- fontdesc->dictLookup("StemV", &stemV);
+- fd = epdf_create_fontdescriptor(fontmap, zround(stemV->getNum()));
+- if (fontdesc->dictLookup("CharSet", &charset) &&
+- charset->isString() && is_subsetable(fontmap))
+- epdf_mark_glyphs(fd, charset->getString()->getCString());
++ stemV = fontdesc.dictLookup("StemV");
++ fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum()));
++ charset = fontdesc.dictLookup("CharSet");
++ if (!charset.isNull() &&
++ charset.isString() && is_subsetable(fontmap))
++ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
+ else
+ embed_whole_font(fd);
+- addFontDesc(fontdescRef->getRef(), fd);
++ addFontDesc(fontdescRef.getRef(), fd);
+ copyName(tag);
+ gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(),
+- fontdict->getDict());
++ fontdict.getDict());
+ pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd,
+ addEncoding(gfont)));
+ } else {
+@@ -451,24 +445,24 @@ static void copyFont(char *tag, Object * fontRef)
+
+ static void copyFontResources(Object * obj)
+ {
+- PdfObject fontRef;
++ Object fontRef;
+ int i, l;
+ if (!obj->isDict())
+ pdftex_fail("PDF inclusion: invalid font resources dict type <%s>",
+ obj->getTypeName());
+ pdf_puts("/Font << ");
+ for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
+- obj->dictGetValNF(i, &fontRef);
+- if (fontRef->isRef())
+- copyFont(obj->dictGetKey(i), &fontRef);
+- else if (fontRef->isDict()) { // some programs generate pdf with embedded font object
+- copyName(obj->dictGetKey(i));
++ fontRef = obj->dictGetValNF(i).copy();
++ if (fontRef.isRef())
++ copyFont((char *)obj->dictGetKey(i), &fontRef);
++ else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
++ copyName((char *)obj->dictGetKey(i));
+ pdf_puts(" ");
+ copyObject(&fontRef);
+ }
+ else
+ pdftex_fail("PDF inclusion: invalid font in reference type <%s>",
+- fontRef->getTypeName());
++ fontRef.getTypeName());
+ }
+ pdf_puts(">>\n");
+ }
+@@ -557,7 +551,7 @@ static char *convertNumToPDF(double n)
+
+ static void copyObject(Object * obj)
+ {
+- PdfObject obj1;
++ Object obj1;
+ int i, l, c;
+ Ref ref;
+ char *p;
+@@ -571,8 +565,8 @@ static void copyObject(Object * obj)
+ } else if (obj->isNum()) {
+ pdf_printf("%s", convertNumToPDF(obj->getNum()));
+ } else if (obj->isString()) {
+- s = obj->getString();
+- p = s->getCString();
++ s = (GooString *)obj->getString();
++ p = (char *)s->c_str();
+ l = s->getLength();
+ if (strlen(p) == (unsigned int) l) {
+ pdf_puts("(");
+@@ -595,14 +589,14 @@ static void copyObject(Object * obj)
+ pdf_puts(">");
+ }
+ } else if (obj->isName()) {
+- copyName(obj->getName());
++ copyName((char *)obj->getName());
+ } else if (obj->isNull()) {
+ pdf_puts("null");
+ } else if (obj->isArray()) {
+ pdf_puts("[");
+ for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+- obj->arrayGetNF(i, &obj1);
+- if (!obj1->isName())
++ obj1 = obj->arrayGetNF(i).copy();
++ if (!obj1.isName())
+ pdf_puts(" ");
+ copyObject(&obj1);
+ }
+@@ -612,9 +606,8 @@ static void copyObject(Object * obj)
+ copyDict(obj);
+ pdf_puts(">>");
+ } else if (obj->isStream()) {
+- initDictFromDict(obj1, obj->streamGetDict());
+ pdf_puts("<<\n");
+- copyDict(&obj1);
++ copyDict(obj->getStream()->getDictObject());
+ pdf_puts(">>\n");
+ pdf_puts("stream\n");
+ copyStream(obj->getStream()->getUndecodedStream());
+@@ -638,9 +631,8 @@ static void writeRefs()
+ InObj *r;
+ for (r = inObjList; r != 0; r = r->next) {
+ if (!r->written) {
+- Object obj1;
+ r->written = 1;
+- xref->fetch(r->ref.num, r->ref.gen, &obj1);
++ Object obj1 = xref->fetch(r->ref.num, r->ref.gen);
+ if (r->type == objFont) {
+ assert(!obj1.isStream());
+ pdfbeginobj(r->num, 2); // \pdfobjcompresslevel = 2 is for this
+@@ -656,7 +648,6 @@ static void writeRefs()
+ pdf_puts("\n");
+ pdfendobj();
+ }
+- obj1.free();
+ }
+ }
+ }
+@@ -673,7 +664,7 @@ static void writeEncodings()
+ ("PDF inclusion: CID fonts are not supported"
+ " (try to disable font replacement to fix this)");
+ }
+- if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
++ if ((s = (char *)((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
+ glyphNames[i] = s;
+ else
+ glyphNames[i] = notdef;
+@@ -685,14 +676,14 @@ static void writeEncodings()
+ #ifdef POPPLER_VERSION
+ r->font->decRefCnt();
+ #else
+- delete r->font;
++#error POPPLER_VERSION should be defined.
+ #endif
+ delete r;
+ }
+ }
+
+ // get the pagebox according to the pagebox_spec
+-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
++static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+ {
+ if (pagebox_spec == pdfboxspecmedia)
+ return page->getMediaBox();
+@@ -724,17 +715,17 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
+ {
+ PdfDocument *pdf_doc;
+ Page *page;
+- PDFRectangle *pagebox;
++ const PDFRectangle *pagebox;
+ #ifdef POPPLER_VERSION
+ int pdf_major_version_found, pdf_minor_version_found;
+ #else
+- float pdf_version_found, pdf_version_wanted;
++#error POPPLER_VERSION should be defined.
+ #endif
+ // initialize
+ if (!isInit) {
+- globalParams = new GlobalParams();
+- globalParams->setErrQuiet(gFalse);
+- isInit = gTrue;
++ globalParams = std::make_unique<GlobalParams>();
++ globalParams->setErrQuiet(false);
++ isInit = true;
+ }
+ // open PDF file
+ pdf_doc = find_add_document(image_name);
+@@ -760,33 +751,20 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
+ }
+ }
+ #else
+- pdf_version_found = pdf_doc->doc->getPDFVersion();
+- pdf_version_wanted = major_pdf_version_wanted + (minor_pdf_version_wanted * 0.1);
+- if (pdf_version_found > pdf_version_wanted + 0.01) {
+- char msg[] =
+- "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
+- if (pdf_inclusion_errorlevel > 0) {
+- pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
+- } else if (pdf_inclusion_errorlevel < 0) {
+- ; /* do nothing */
+- } else { /* = 0, give warning */
+- pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
+- }
+- }
++#error POPPLER_VERSION should be defined.
+ #endif
+ epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
+ if (page_name) {
+ // get page by name
+ GString name(page_name);
+- LinkDest *link = pdf_doc->doc->findDest(&name);
++ std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name);
+ if (link == 0 || !link->isOk())
+ pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
+ Ref ref = link->getPageRef();
+- page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen);
++ page_num = pdf_doc->doc->getCatalog()->findPage(ref);
+ if (page_num == 0)
+ pdftex_fail("PDF inclusion: destination is not a page <%s>",
+ page_name);
+- delete link;
+ } else {
+ // get page by number
+ if (page_num <= 0 || page_num > epdf_num_pages)
+@@ -839,8 +817,8 @@ void write_epdf(void)
+ Page *page;
+ Ref *pageRef;
+ Dict *pageDict;
+- PdfObject contents, obj1, obj2, pageObj, dictObj;
+- PdfObject groupDict;
++ Object contents, obj1, obj2, pageObj, dictObj;
++ Object groupDict;
+ bool writeSepGroup = false;
+ Object info;
+ char *key;
+@@ -867,10 +845,10 @@ void write_epdf(void)
+ encodingList = 0;
+ page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page);
+ pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page);
+- xref->fetch(pageRef->num, pageRef->gen, &pageObj);
+- pageDict = pageObj->getDict();
++ pageObj = xref->fetch(pageRef->num, pageRef->gen);
++ pageDict = pageObj.getDict();
+ rotate = page->getRotate();
+- PDFRectangle *pagebox;
++ const PDFRectangle *pagebox;
+ // write the Page header
+ pdf_puts("/Type /XObject\n");
+ pdf_puts("/Subtype /Form\n");
+@@ -886,7 +864,7 @@ void write_epdf(void)
+ pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
+ }
+ if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) {
+- pdf_doc->doc->getDocInfoNF(&info);
++ info = pdf_doc->doc->getDocInfoNF().copy();
+ if (info.isRef()) {
+ // the info dict must be indirect (PDF Ref p. 61)
+ pdf_printf("/%s.InfoDict ", pdfkeyprefix);
+@@ -942,14 +920,14 @@ void write_epdf(void)
+ pdf_puts(stripzeros(s));
+
+ // Metadata validity check (as a stream it must be indirect)
+- pageDict->lookupNF("Metadata", &dictObj);
+- if (!dictObj->isNull() && !dictObj->isRef())
++ dictObj = pageDict->lookupNF("Metadata").copy();
++ if (!dictObj.isNull() && !dictObj.isRef())
+ pdftex_warn("PDF inclusion: /Metadata must be indirect object");
+
+ // copy selected items in Page dictionary except Resources & Group
+ for (i = 0; pageDictKeys[i] != NULL; i++) {
+- pageDict->lookupNF(pageDictKeys[i], &dictObj);
+- if (!dictObj->isNull()) {
++ dictObj = pageDict->lookupNF(pageDictKeys[i]).copy();
++ if (!dictObj.isNull()) {
+ pdf_newline();
+ pdf_printf("/%s ", pageDictKeys[i]);
+ copyObject(&dictObj); // preserves indirection
+@@ -957,8 +935,8 @@ void write_epdf(void)
+ }
+
+ // handle page group
+- pageDict->lookupNF("Group", &dictObj);
+- if (!dictObj->isNull()) {
++ dictObj = pageDict->lookupNF("Group").copy();
++ if (!dictObj.isNull()) {
+ if (pdfpagegroupval == 0) {
+ // another pdf with page group was included earlier on the
+ // same page; copy the Group entry as is. See manual for
+@@ -972,11 +950,36 @@ void write_epdf(void)
+ copyObject(&dictObj);
+ } else {
+ // write Group dict as a separate object, since the Page dict also refers to it
+- pageDict->lookup("Group", &dictObj);
+- if (!dictObj->isDict())
++ dictObj = pageDict->lookup("Group");
++ if (!dictObj.isDict())
+ pdftex_fail("PDF inclusion: /Group dict missing");
+ writeSepGroup = true;
+- initDictFromDict(groupDict, page->getGroup());
++/*
++This part is only a single line
++ groupDict = Object(page->getGroup());
++in the original patch. In this case, however, pdftex crashes at
++"delete pdf_doc->doc" in "delete_document()" for inclusion of some
++kind of pdf images, for example, figure_missing.pdf in gnuplot.
++A change
++ groupDict = Object(page->getGroup()).copy();
++does not improve the situation.
++The changes below seem to work fine.
++*/
++// begin modification
++ groupDict = pageDict->lookup("Group");
++ const Dict& dic1 = page->getGroup();
++ const Dict& dic2 = groupDict.getDict();
++ // replace dic2 in groupDict with dic1
++ l = dic2.getLength();
++ for (i = 0; i < l; i++) {
++ groupDict.dictRemove(dic2.getKey(i));
++ }
++ l = dic1.getLength();
++ for (i = 0; i < l; i++) {
++ groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
++ dic1.getValNF(i).copy());
++ }
++// end modification
+ pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
+ }
+ }
+@@ -989,28 +992,28 @@ void write_epdf(void)
+ pdftex_warn
+ ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)");
+ } else {
+- initDictFromDict(obj1, page->getResourceDict());
++ Object *obj1 = page->getResourceDictObject();
+ if (!obj1->isDict())
+ pdftex_fail("PDF inclusion: invalid resources dict type <%s>",
+ obj1->getTypeName());
+ pdf_newline();
+ pdf_puts("/Resources <<\n");
+ for (i = 0, l = obj1->dictGetLength(); i < l; ++i) {
+- obj1->dictGetVal(i, &obj2);
+- key = obj1->dictGetKey(i);
++ obj2 = obj1->dictGetVal(i);
++ key = (char *)obj1->dictGetKey(i);
+ if (strcmp("Font", key) == 0)
+ copyFontResources(&obj2);
+ else if (strcmp("ProcSet", key) == 0)
+ copyProcSet(&obj2);
+ else
+- copyOtherResources(&obj2, key);
++ copyOtherResources(&obj2, (char *)key);
+ }
+ pdf_puts(">>\n");
+ }
+
+ // write the page contents
+- page->getContents(&contents);
+- if (contents->isStream()) {
++ contents = page->getContents();
++ if (contents.isStream()) {
+
+ // Variant A: get stream and recompress under control
+ // of \pdfcompresslevel
+@@ -1021,36 +1024,35 @@ void write_epdf(void)
+
+ // Variant B: copy stream without recompressing
+ //
+- contents->streamGetDict()->lookup("F", &obj1);
+- if (!obj1->isNull()) {
++ obj1 = contents.streamGetDict()->lookup("F");
++ if (!obj1.isNull()) {
+ pdftex_fail("PDF inclusion: Unsupported external stream");
+ }
+- contents->streamGetDict()->lookup("Length", &obj1);
+- assert(!obj1->isNull());
++ obj1 = contents.streamGetDict()->lookup("Length");
++ assert(!obj1.isNull());
+ pdf_puts("/Length ");
+ copyObject(&obj1);
+ pdf_puts("\n");
+- contents->streamGetDict()->lookup("Filter", &obj1);
+- if (!obj1->isNull()) {
++ obj1 = contents.streamGetDict()->lookup("Filter");
++ if (!obj1.isNull()) {
+ pdf_puts("/Filter ");
+ copyObject(&obj1);
+ pdf_puts("\n");
+- contents->streamGetDict()->lookup("DecodeParms", &obj1);
+- if (!obj1->isNull()) {
++ obj1 = contents.streamGetDict()->lookup("DecodeParms");
++ if (!obj1.isNull()) {
+ pdf_puts("/DecodeParms ");
+ copyObject(&obj1);
+ pdf_puts("\n");
+ }
+ }
+ pdf_puts(">>\nstream\n");
+- copyStream(contents->getStream()->getUndecodedStream());
++ copyStream(contents.getStream()->getUndecodedStream());
+ pdfendstream();
+- } else if (contents->isArray()) {
++ } else if (contents.isArray()) {
+ pdfbeginstream();
+- for (i = 0, l = contents->arrayGetLength(); i < l; ++i) {
+- Object contentsobj;
+- copyStream((contents->arrayGet(i, &contentsobj))->getStream());
+- contentsobj.free();
++ for (i = 0, l = contents.arrayGetLength(); i < l; ++i) {
++ Object contentsobj = contents.arrayGet(i);
++ copyStream(contentsobj.getStream());
+ if (i < l - 1)
+ pdf_newline(); // add a newline after each stream except the last
+ }
+@@ -1104,7 +1106,5 @@ void epdf_check_mem()
+ n = p->next;
+ delete_document(p);
+ }
+- // see above for globalParams
+- delete globalParams;
+ }
+ }
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
+index 67be229e..950e14ff 100644
+--- a/texk/web2c/pdftexdir/pdftosrc.cc
++++ b/texk/web2c/pdftexdir/pdftosrc.cc
+@@ -16,6 +16,14 @@ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
++
++/*
++This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
++https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
++by Arch Linux. The poppler should be 0.83.0 or newer versions.
++POPPLER_VERSION should be defined.
++*/
++
+ #include <w2c/config.h>
+
+ #include <stdlib.h>
+@@ -32,10 +40,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <goo/gmem.h>
+ #include <goo/gfile.h>
+ #else
+-#include <aconf.h>
+-#include <GString.h>
+-#include <gmem.h>
+-#include <gfile.h>
++#error POPPLER_VERSION should be defined.
+ #endif
+ #include <assert.h>
+
+@@ -74,7 +79,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ fileName = new GString(argv[1]);
+- globalParams = new GlobalParams();
++ globalParams = std::make_unique<GlobalParams>();
+ doc = new PDFDoc(fileName);
+ if (!doc->isOk()) {
+ fprintf(stderr, "Invalid PDF file\n");
+@@ -86,36 +91,34 @@ int main(int argc, char *argv[])
+ objgen = atoi(argv[3]);
+ }
+ xref = doc->getXRef();
+- catalogDict.initNull();
+- xref->getCatalog(&catalogDict);
++ catalogDict = xref->getCatalog();
+ if (!catalogDict.isDict("Catalog")) {
+ fprintf(stderr, "No Catalog found\n");
+ exit(1);
+ }
+- srcStream.initNull();
++ srcStream = Object(objNull);
+ if (objnum == 0) {
+- catalogDict.dictLookup("SourceObject", &srcStream);
+- static char const_SourceFile[] = "SourceFile";
+- if (!srcStream.isStream(const_SourceFile)) {
++ srcStream = catalogDict.dictLookup("SourceObject");
++ static const char *const_SourceFile = "SourceFile";
++ if (!srcStream.isDict(const_SourceFile)) {
+ fprintf(stderr, "No SourceObject found\n");
+ exit(1);
+ }
+- srcName.initNull();
+- srcStream.getStream()->getDict()->lookup("SourceName", &srcName);
++ srcName = srcStream.getStream()->getDict()->lookup("SourceName");
+ if (!srcName.isString()) {
+ fprintf(stderr, "No SourceName found\n");
+ exit(1);
+ }
+- outname = srcName.getString()->getCString();
++ outname = (char *)srcName.getString()->c_str();
+ // We cannot free srcName, as objname shares its string.
+ // srcName.free();
+ } else if (objnum > 0) {
+- xref->fetch(objnum, objgen, &srcStream);
++ srcStream = xref->fetch(objnum, objgen);
+ if (!srcStream.isStream()) {
+ fprintf(stderr, "Not a Stream object\n");
+ exit(1);
+ }
+- sprintf(buf, "%s", fileName->getCString());
++ sprintf(buf, "%s", fileName->c_str());
+ if ((p = strrchr(buf, '.')) == 0)
+ p = strchr(buf, 0);
+ if (objgen == 0)
+@@ -125,7 +128,7 @@ int main(int argc, char *argv[])
+ outname = buf;
+ } else { // objnum < 0 means we are extracting the XRef table
+ extract_xref_table = true;
+- sprintf(buf, "%s", fileName->getCString());
++ sprintf(buf, "%s", fileName->c_str());
+ if ((p = strrchr(buf, '.')) == 0)
+ p = strchr(buf, 0);
+ sprintf(p, ".xref");
+@@ -158,36 +161,28 @@ int main(int argc, char *argv[])
+ Object objStr, obj1, obj2;
+ int nObjects, first, n;
+ int localOffset = 0;
+- Guint firstOffset;
++ unsigned int firstOffset;
+
+- assert(xref->fetch(e->offset, 0, &objStr)->isStream());
+- nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt();
+- obj1.free();
+- first = objStr.streamGetDict()->lookup("First", &obj1)->getInt();
+- obj1.free();
++ objStr = xref->fetch(e->offset, 0);
++ assert(objStr.isStream());
++ obj1 = objStr.streamGetDict()->lookup("N");
++ nObjects = obj1.getInt();
++ obj1 = objStr.streamGetDict()->lookup("First");
++ first = obj1.getInt();
+ firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
+
+ // parse the header: object numbers and offsets
+ objStr.streamReset();
+- obj1.initNull();
+- str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first);
+- lexer = new Lexer(xref, str);
+- parser = new Parser(xref, lexer, gFalse);
++ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
++ parser = new Parser(xref, str, false);
+ for (n = 0; n < nObjects; ++n) {
+- parser->getObj(&obj1);
+- parser->getObj(&obj2);
++ obj1 = parser->getObj();
++ obj2 = parser->getObj();
+ if (n == e->gen)
+ localOffset = obj2.getInt();
+- obj1.free();
+- obj2.free();
+ }
+-#if defined(POPPLER_VERSION) || defined(XPDF304)
+ while (str->getChar() != EOF) ;
+-#else /* xpdf 4.00 */
+- lexer->skipToEOF();
+-#endif
+ delete parser;
+- objStr.free();
+
+ fprintf(outfile, "%.10lu 00000 n\n",
+ (long unsigned)(firstOffset + localOffset));
+@@ -198,7 +193,6 @@ int main(int argc, char *argv[])
+ s->reset();
+ while ((c = s->getChar()) != EOF)
+ fputc(c, outfile);
+- srcStream.free();
+ }
+ if (objnum == 0)
+ fprintf(stderr, "Source file extracted to %s\n", outname);
+@@ -207,7 +201,5 @@ int main(int argc, char *argv[])
+ else
+ fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
+ fclose(outfile);
+- catalogDict.free();
+ delete doc;
+- delete globalParams;
+ }
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-11 16:10 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-11 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 0587f1e3cef04051db114a0f9a1cfc7b71148fe1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 16:05:15 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 16:09:48 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=0587f1e3
2020/patches: restore some patches from tl-2019
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
2020/patches/0002-normalize-all-updmap-path.patch | 29 ++++++++++++++
.../0003-fix-a2ping-invocation-and-shebang.patch | 29 ++++++++++++++
| 35 ++++++++++++++++
...mx-src-libf2c-f2c.h-remove-unnecesary-mac.patch | 40 +++++++++++++++++++
.../0006-latex2man-use-predictable-tmp.patch | 46 ++++++++++++++++++++++
5 files changed, 179 insertions(+)
diff --git a/2020/patches/0002-normalize-all-updmap-path.patch b/2020/patches/0002-normalize-all-updmap-path.patch
new file mode 100644
index 0000000..4067716
--- /dev/null
+++ b/2020/patches/0002-normalize-all-updmap-path.patch
@@ -0,0 +1,29 @@
+From 7dfce929c2a21d56677695b42953b6f42b05d99d Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 13:50:24 +0300
+Subject: [PATCH 2/6] normalize all updmap path
+
+https://bugs.gentoo.org/show_bug.cgi?id=428350
+Normalize the path here too otherwise it may fail.
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/texlive/linked_scripts/texlive/updmap.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/texk/texlive/linked_scripts/texlive/updmap.pl b/texk/texlive/linked_scripts/texlive/updmap.pl
+index d1cfe6c5..f0ad22e2 100755
+--- a/texk/texlive/linked_scripts/texlive/updmap.pl
++++ b/texk/texlive/linked_scripts/texlive/updmap.pl
+@@ -1491,7 +1491,7 @@ sub setOptions {
+
+ sub enable_disable_maps {
+ my (@what) = @_;
+- my $tc = $alldata->{'changes_config'};
++ my $tc = Cwd::abs_path($alldata->{'changes_config'});
+ die "$prg: top config file $tc has not been read."
+ if (!defined($alldata->{'updmap'}{$tc}));
+
+--
+2.21.0
+
diff --git a/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch b/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch
new file mode 100644
index 0000000..39c5902
--- /dev/null
+++ b/2020/patches/0003-fix-a2ping-invocation-and-shebang.patch
@@ -0,0 +1,29 @@
+From d30f80744348fedb7ac0f1d0ff0af4cee8a4ecf2 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 14:08:29 +0300
+Subject: [PATCH 3/6] fix a2ping invocation and shebang
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/texlive/linked_scripts/a2ping/a2ping.pl | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/texk/texlive/linked_scripts/a2ping/a2ping.pl b/texk/texlive/linked_scripts/a2ping/a2ping.pl
+index 2f1a3bda..d0275dca 100755
+--- a/texk/texlive/linked_scripts/a2ping/a2ping.pl
++++ b/texk/texlive/linked_scripts/a2ping/a2ping.pl
+@@ -1,9 +1,5 @@
+-#! /bin/sh
+-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \
+-;exec perl -x -- "$0" ${1+"$@"};#'if 0;
+-eval 'setenv PERL_BADLANG x;exec perl -x -- "$0" $argv:q;#'.q+
+-#!perl -w
+-package Htex::a2ping; $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1;
++#! /usr/bin/perl
++package Htex::a2ping;
+ # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib
+ #
+ # This program is free software, licensed under the GNU GPL, >=2.0.
+--
+2.21.0
+
--git a/2020/patches/0004-remove-luazlib-zlib-header-check.patch b/2020/patches/0004-remove-luazlib-zlib-header-check.patch
new file mode 100644
index 0000000..f6c1fd3
--- /dev/null
+++ b/2020/patches/0004-remove-luazlib-zlib-header-check.patch
@@ -0,0 +1,35 @@
+From 47ca872d418772a227f143ec17fe4341a7afaf75 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 14:16:09 +0300
+Subject: [PATCH 4/6] remove luazlib zlib header check
+
+https://bugs.gentoo.org/show_bug.cgi?id=310487
+https://bugs.gentoo.org/show_bug.cgi?id=605766
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/web2c/luatexdir/luazlib/lzlib.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/texk/web2c/luatexdir/luazlib/lzlib.c b/texk/web2c/luatexdir/luazlib/lzlib.c
+index e61f92d5..b03e14d4 100644
+--- a/texk/web2c/luatexdir/luazlib/lzlib.c
++++ b/texk/web2c/luatexdir/luazlib/lzlib.c
+@@ -544,14 +544,6 @@ LUALIB_API int luaopen_zlib(lua_State *L)
+
+ /* ====================================================================== */
+
+- /* make sure header and library version are consistent */
+- const char* version = zlibVersion();
+- if (strncmp(version, ZLIB_VERSION, 4))
+- {
+- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
+- lua_error(L);
+- }
+-
+ /* create new metatable for zlib compression structures */
+ luaL_newmetatable(L, ZSTREAMMETA);
+ lua_pushliteral(L, "__index");
+--
+2.21.0
+
diff --git a/2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch b/2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch
new file mode 100644
index 0000000..015bba9
--- /dev/null
+++ b/2020/patches/0005-utils-pmx-pmx-src-libf2c-f2c.h-remove-unnecesary-mac.patch
@@ -0,0 +1,40 @@
+From 166153198502454a8373e941b80c21ede38ddf3f Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 14:38:31 +0300
+Subject: [PATCH 5/6] utils/pmx/pmx-src/libf2c/f2c.h: remove unnecesary macro
+ for abs()
+
+On POSIX systems, abs() is a function provided by your C Standard library,
+so we don't need to define it as a macro. It is dangerous to do so because
+if f2c.h is included before stdlib.h, then then macro breaks the function
+prototype.
+
+See
+
+https://bugs.gentoo.org/show_bug.cgi?id=510770
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ utils/pmx/pmx-src/libf2c/f2c.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/pmx/pmx-src/libf2c/f2c.h b/utils/pmx/pmx-src/libf2c/f2c.h
+index a8d13f6b..22c439c6 100644
+--- a/utils/pmx/pmx-src/libf2c/f2c.h
++++ b/utils/pmx/pmx-src/libf2c/f2c.h
+@@ -162,8 +162,8 @@ struct Namelist {
+ };
+ typedef struct Namelist Namelist;
+
+-#define abs(x) ((x) >= 0 ? (x) : -(x))
+-#define dabs(x) (doublereal)abs(x)
++extern int abs(int x);
++#define dabs(x) ((doublereal)((x) >= 0 ? (x) : -(x)))
+ #undef min
+ #undef max
+ #define min(a,b) ((a) <= (b) ? (a) : (b))
+--
+2.21.0
+
diff --git a/2020/patches/0006-latex2man-use-predictable-tmp.patch b/2020/patches/0006-latex2man-use-predictable-tmp.patch
new file mode 100644
index 0000000..581b0be
--- /dev/null
+++ b/2020/patches/0006-latex2man-use-predictable-tmp.patch
@@ -0,0 +1,46 @@
+From 5dd262d2db90dc44097131fb8f160772aed407ad Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Jun 2019 14:50:27 +0300
+Subject: [PATCH 6/6] latex2man: use predictable tmp
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668779
+https://bugs.gentoo.org/show_bug.cgi?id=432144
+CVE-2012-2120 (http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2120)
+---
+ texk/texlive/linked_scripts/latex2man/latex2man | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/texk/texlive/linked_scripts/latex2man/latex2man b/texk/texlive/linked_scripts/latex2man/latex2man
+index e117d337..285c19fd 100755
+--- a/texk/texlive/linked_scripts/latex2man/latex2man
++++ b/texk/texlive/linked_scripts/latex2man/latex2man
+@@ -31,8 +31,6 @@ sub date2str;
+ $VERSION = "1.29";
+ $DATE = date2str ('$Date: 2018/11/25 13:05:37 $' =~ m|(\d+/\d+/\d+)|);
+
+-$tmp = "/tmp/$CMD.$$";
+-
+ ##################################################################
+ # check option and arguments
+ ##################################################################
+@@ -153,7 +151,7 @@ $first_word = 1; # true, if the next word to be processed is the first
+ $list_nest = 0; # counts nesting of itemize/enumerate/description envrionments
+ $cur_list[0] = "";# array, indexed with list_nest, indicates kind of list:
+ # values are: 'enum' / 'descr' / 'item'
+-$item_nr[0] = 0; # array, indexed with list_nest, counts the number of \item in the
++$item_nr[0] = 0; # array, indexed with list_nest, counts the number of W\item in the
+ # list
+ $manRS = 0; # true, if for Man a .RS was given after a \item
+
+@@ -2018,6 +2016,8 @@ if ($opt_t) {
+ open (my $SRC, "<$SrcFile") || die "$CMD: Can't open file \`$SrcFile' for reading.\n";
+ if ($opt_H || $opt_T) {
+ # DestFile will be written in the postprocess
++ $tmp = `mktemp` || die;
++ chomp $tmp;
+ open (DEST, ">$tmp") || die "$CMD: Can't open file \`$tmp' for writing.\n";
+ } else {
+ open (DEST, ">$DestFile") || die "$CMD: Can't open file \`$DestFile' for writing.\n";
+--
+2.21.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-13 21:31 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-13 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 65e3fd766133668c27e7ecdbb41a67610e6a944f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 21:31:10 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 21:31:10 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=65e3fd76
unbundle linked scripts for 2020
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...1-tl-core-2020-unbundle-installed_scripts.patch | 241 +++++++++++++++++++++
1 file changed, 241 insertions(+)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
new file mode 100644
index 0000000..1683018
--- /dev/null
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -0,0 +1,241 @@
+From cc8501e87a978e256a20405aa953282f37365ffe Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Mon, 13 Apr 2020 15:48:05 +0300
+Subject: [PATCH] patch1
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/texlive/linked_scripts/Makefile.am | 4 --
+ texk/texlive/linked_scripts/Makefile.in | 78 +------------------------
+ 2 files changed, 2 insertions(+), 80 deletions(-)
+
+diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
+index 92c8629d..9810d679 100644
+--- a/texk/texlive/linked_scripts/Makefile.am
++++ b/texk/texlive/linked_scripts/Makefile.am
+@@ -70,7 +70,6 @@ texmf_shell_scripts = \
+ pdftex-quiet/pdftex-quiet \
+ pdfxup/pdfxup \
+ pst-pdf/ps4pdf \
+- simpdftex/simpdftex \
+ texlive-extra/allcm.sh \
+ texlive-extra/allneeded.sh \
+ texlive-extra/dvi2fax.sh \
+@@ -110,7 +109,6 @@ texmf_other_scripts = \
+ cjk-gs-integrate/cjk-gs-integrate.pl \
+ clojure-pamphlet/pamphletangler \
+ cluttex/cluttex.lua \
+- context/perl/mptopdf.pl \
+ convbkmk/convbkmk.rb \
+ crossrefware/bbl2bib.pl \
+ crossrefware/bibdoiadd.pl \
+@@ -215,7 +213,6 @@ texmf_other_scripts = \
+ texlive/mktexpk \
+ texlive/mktextfm \
+ texlive/rungs.tlu \
+- texlive/tlmgr.pl \
+ texlive/updmap-sys.sh \
+ texlive/updmap-user.sh \
+ texlive/updmap.pl \
+@@ -225,7 +222,6 @@ texmf_other_scripts = \
+ texplate/texplate.sh \
+ thumbpdf/thumbpdf.pl \
+ tlcockpit/tlcockpit.sh \
+- tlshell/tlshell.tcl \
+ ulqda/ulqda.pl \
+ urlbst/urlbst \
+ vpe/vpe.pl \
+diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
+index 5bf620be..38bcd566 100644
+--- a/texk/texlive/linked_scripts/Makefile.in
++++ b/texk/texlive/linked_scripts/Makefile.in
+@@ -269,32 +269,25 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
+ texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts
+ texmf_shell_scripts = \
+ adhocfilelist/adhocfilelist.sh \
+- bibexport/bibexport.sh \
+ checklistings/checklistings.sh \
+ ctanbib/ctanbib \
+ dtxgen/dtxgen \
+ installfont/installfont-tl \
+ latexfileversion/latexfileversion \
+- listbib/listbib \
+ listings-ext/listings-ext.sh \
+ ltxfileinfo/ltxfileinfo \
+ pdfbook2/pdfbook2 \
+ pdfjam/pdfjam \
+ pdftex-quiet/pdftex-quiet \
+ pdfxup/pdfxup \
+- pst-pdf/ps4pdf \
+- simpdftex/simpdftex \
+ texlive-extra/allcm.sh \
+ texlive-extra/allneeded.sh \
+ texlive-extra/dvi2fax.sh \
+ texlive-extra/dvired.sh \
+- texlive-extra/fontinst.sh \
+ texlive-extra/kpsetool.sh \
+ texlive-extra/kpsewhere.sh \
+ texlive-extra/ps2frag.sh \
+ texlive-extra/pslatex.sh \
+- texlive-extra/rubibtex.sh \
+- texlive-extra/rumakeindex.sh \
+ texlive-extra/texconfig-dialog.sh \
+ texlive-extra/texconfig-sys.sh \
+ texlive-extra/texconfig.sh \
+@@ -302,63 +295,30 @@ texmf_shell_scripts = \
+ texosquery/texosquery.sh \
+ texosquery/texosquery-jre5.sh \
+ texosquery/texosquery-jre8.sh \
+- typeoutfileinfo/typeoutfileinfo.sh \
+- wordcount/wordcount.sh
++ typeoutfileinfo/typeoutfileinfo.sh
+
+ texmf_other_scripts = \
+ a2ping/a2ping.pl \
+- accfonts/mkt1font \
+- accfonts/vpl2ovp \
+- accfonts/vpl2vpl \
+ arara/arara.sh \
+- attachfile2/pdfatfi.pl \
+- authorindex/authorindex \
+- bib2gls/bib2gls.sh \
+- bib2gls/convertgls2bib.sh \
+ bundledoc/arlatex \
+ bundledoc/bundledoc \
+- cachepic/cachepic.tlu \
+- checkcites/checkcites.lua \
+ chklref/chklref.pl \
+- cjk-gs-integrate/cjk-gs-integrate.pl \
+ clojure-pamphlet/pamphletangler \
+ cluttex/cluttex.lua \
+- context/perl/mptopdf.pl \
+ convbkmk/convbkmk.rb \
+- crossrefware/bbl2bib.pl \
+- crossrefware/bibdoiadd.pl \
+- crossrefware/bibmradd.pl \
+- crossrefware/biburl2doi.pl \
+- crossrefware/bibzbladd.pl \
+- crossrefware/ltx2crossrefxml.pl \
+ ctan-o-mat/ctan-o-mat.pl \
+ ctanify/ctanify \
+ ctanupload/ctanupload.pl \
+ de-macro/de-macro \
+- diadia/diadia.lua \
+- dosepsbin/dosepsbin.pl \
+ dviasm/dviasm.py \
+ dviinfox/dviinfox.pl \
+- ebong/ebong.py \
+ epspdf/epspdf.tlu \
+ epspdf/epspdftk.tcl \
+- epstopdf/epstopdf.pl \
+- exceltex/exceltex \
+- fig4latex/fig4latex \
+ findhyph/findhyph \
+- fontools/afm2afm \
+- fontools/autoinst \
+- fontools/ot2kpx \
+ fragmaster/fragmaster.pl \
+- getmap/getmapdl.lua \
+ glossaries/makeglossaries \
+ glossaries/makeglossaries-lite.lua \
+- jfmutil/jfmutil.pl \
+ ketcindy/ketcindy.pl \
+- kotex-utils/jamo-normalize.pl \
+- kotex-utils/komkindex.pl \
+- kotex-utils/ttf2kotexfont.pl \
+- l3build/l3build.lua \
+ latex-git-log/latex-git-log \
+ latex-papersize/latex-papersize.py \
+ latex2man/latex2man \
+@@ -373,46 +333,30 @@ texmf_other_scripts = \
+ lilyglyphs/lily-image-commands.py \
+ lilyglyphs/lily-rebuild-pdfs.py \
+ ltximg/ltximg.pl \
+- luaotfload/luaotfload-tool.lua \
+- lwarp/lwarpmk.lua \
+ m-tx/m-tx.lua \
+- makedtx/makedtx.pl \
+ make4ht/make4ht \
+ match_parens/match_parens \
+- mathspic/mathspic.pl \
+- mf2pt1/mf2pt1.pl \
+- mkgrkindex/mkgrkindex \
+ mkjobtexmf/mkjobtexmf.pl \
+- mkpic/mkpic \
+- multibibliography/multibibliography.pl \
+ musixtex/musixflx.lua \
+ musixtex/musixtex.lua \
+ pax/pdfannotextractor.pl \
+ pdfcrop/pdfcrop.pl \
+ pdflatexpicscale/pdflatexpicscale.pl \
+- pedigree-perl/pedigree.pl \
+- perltex/perltex.pl \
+- petri-nets/pn2pdf \
+ pfarrei/a5toa4.tlu \
+ pfarrei/pfarrei.tlu \
+ pkfix-helper/pkfix-helper \
+ pkfix/pkfix.pl \
+ pmxchords/pmxchords.lua \
+- pst2pdf/pst2pdf.pl \
+ ptex-fontmaps/kanji-config-updmap-sys.sh \
+ ptex-fontmaps/kanji-config-updmap-user.sh \
+ ptex-fontmaps/kanji-config-updmap.pl \
+ ptex-fontmaps/kanji-fontmap-creator.pl \
+ ptex2pdf/ptex2pdf.lua \
+ purifyeps/purifyeps \
+- pygmentex/pygmentex.py \
+ pythontex/depythontex.py \
+ pythontex/pythontex.py \
+- rubik/rubikrotation.pl \
+- splitindex/splitindex.pl \
+ srcredact/srcredact.pl \
+ sty2dtx/sty2dtx.pl \
+- svn-multi/svn-multi.pl \
+ tex4ebook/tex4ebook \
+ texcount/texcount.pl \
+ texdef/texdef.pl \
+@@ -428,7 +372,6 @@ texmf_other_scripts = \
+ texlive/mktexpk \
+ texlive/mktextfm \
+ texlive/rungs.tlu \
+- texlive/tlmgr.pl \
+ texlive/updmap-sys.sh \
+ texlive/updmap-user.sh \
+ texlive/updmap.pl \
+@@ -436,24 +379,8 @@ texmf_other_scripts = \
+ texliveonfly/texliveonfly.py \
+ texloganalyser/texloganalyser \
+ texplate/texplate.sh \
+- thumbpdf/thumbpdf.pl \
+ tlcockpit/tlcockpit.sh \
+- tlshell/tlshell.tcl \
+- ulqda/ulqda.pl \
+- urlbst/urlbst \
+- vpe/vpe.pl \
+- webquiz/webquiz.py \
+- xindex/xindex.lua \
+- yplan/yplan
+-
+-texmf_context_scripts = \
+- context/stubs/unix/context \
+- context/stubs/unix/contextjit \
+- context/stubs/unix/luatools \
+- context/stubs/unix/mtxrun \
+- context/stubs/unix/mtxrunjit \
+- context/stubs/unix/texexec \
+- context/stubs/unix/texmfstart
++ xindex/xindex.lua
+
+ nobase_dist_texmf_scripts_SCRIPTS = \
+ $(texmf_shell_scripts) \
+@@ -464,7 +391,6 @@ bin_links = \
+ allcm:allec \
+ cluttex:clxelatex \
+ cluttex:cllualatex \
+- epstopdf:repstopdf \
+ fmtutil:mktexfmt \
+ kpsetool:kpsexpand \
+ kpsetool:kpsepath \
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-14 7:24 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-14 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 117f61fc23169d0dcd5c5c3cd55589c96a25ab6a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 07:23:27 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 07:23:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=117f61fc
update unbundle script more
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...1-tl-core-2020-unbundle-installed_scripts.patch | 32 ++++++++++++----------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 1683018..95697f7 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,4 +1,4 @@
-From cc8501e87a978e256a20405aa953282f37365ffe Mon Sep 17 00:00:00 2001
+From 745cab700ea5905fb749721f905013ba97e05fe0 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Mon, 13 Apr 2020 15:48:05 +0300
Subject: [PATCH] patch1
@@ -6,8 +6,8 @@ Subject: [PATCH] patch1
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/texlive/linked_scripts/Makefile.am | 4 --
- texk/texlive/linked_scripts/Makefile.in | 78 +------------------------
- 2 files changed, 2 insertions(+), 80 deletions(-)
+ texk/texlive/linked_scripts/Makefile.in | 85 +------------------------
+ 2 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..38bcd566 100644
+index 5bf620be..66dd7c24 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,25 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -147,13 +147,17 @@ index 5bf620be..38bcd566 100644
latex-git-log/latex-git-log \
latex-papersize/latex-papersize.py \
latex2man/latex2man \
-@@ -373,46 +333,30 @@ texmf_other_scripts = \
- lilyglyphs/lily-image-commands.py \
- lilyglyphs/lily-rebuild-pdfs.py \
+@@ -369,50 +329,27 @@ texmf_other_scripts = \
+ latexindent/latexindent.pl \
+ latexmk/latexmk.pl \
+ latexpand/latexpand \
+- lilyglyphs/lily-glyph-commands.py \
+- lilyglyphs/lily-image-commands.py \
+- lilyglyphs/lily-rebuild-pdfs.py \
ltximg/ltximg.pl \
- luaotfload/luaotfload-tool.lua \
- lwarp/lwarpmk.lua \
- m-tx/m-tx.lua \
+- m-tx/m-tx.lua \
- makedtx/makedtx.pl \
make4ht/make4ht \
match_parens/match_parens \
@@ -163,8 +167,8 @@ index 5bf620be..38bcd566 100644
mkjobtexmf/mkjobtexmf.pl \
- mkpic/mkpic \
- multibibliography/multibibliography.pl \
- musixtex/musixflx.lua \
- musixtex/musixtex.lua \
+- musixtex/musixflx.lua \
+- musixtex/musixtex.lua \
pax/pdfannotextractor.pl \
pdfcrop/pdfcrop.pl \
pdflatexpicscale/pdflatexpicscale.pl \
@@ -175,7 +179,7 @@ index 5bf620be..38bcd566 100644
pfarrei/pfarrei.tlu \
pkfix-helper/pkfix-helper \
pkfix/pkfix.pl \
- pmxchords/pmxchords.lua \
+- pmxchords/pmxchords.lua \
- pst2pdf/pst2pdf.pl \
ptex-fontmaps/kanji-config-updmap-sys.sh \
ptex-fontmaps/kanji-config-updmap-user.sh \
@@ -194,7 +198,7 @@ index 5bf620be..38bcd566 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +372,6 @@ texmf_other_scripts = \
+@@ -428,7 +365,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -202,7 +206,7 @@ index 5bf620be..38bcd566 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +379,8 @@ texmf_other_scripts = \
+@@ -436,24 +372,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -228,7 +232,7 @@ index 5bf620be..38bcd566 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +391,6 @@ bin_links = \
+@@ -464,7 +384,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-14 7:52 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-14 7:52 UTC (permalink / raw
To: gentoo-commits
commit: 0a58767e9efcfb2bab9ccbb612641fbc81c3480f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 07:52:21 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 07:52:21 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=0a58767e
update unbundle script more
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...1-tl-core-2020-unbundle-installed_scripts.patch | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 95697f7..72c4ad8 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,4 +1,4 @@
-From 745cab700ea5905fb749721f905013ba97e05fe0 Mon Sep 17 00:00:00 2001
+From eeeb8457f722abba934b053dbd159ea7b4858a04 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Mon, 13 Apr 2020 15:48:05 +0300
Subject: [PATCH] patch1
@@ -6,8 +6,8 @@ Subject: [PATCH] patch1
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/texlive/linked_scripts/Makefile.am | 4 --
- texk/texlive/linked_scripts/Makefile.in | 85 +------------------------
- 2 files changed, 2 insertions(+), 87 deletions(-)
+ texk/texlive/linked_scripts/Makefile.in | 90 +------------------------
+ 2 files changed, 2 insertions(+), 92 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..66dd7c24 100644
+index 5bf620be..e762b72a 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,25 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -147,7 +147,7 @@ index 5bf620be..66dd7c24 100644
latex-git-log/latex-git-log \
latex-papersize/latex-papersize.py \
latex2man/latex2man \
-@@ -369,50 +329,27 @@ texmf_other_scripts = \
+@@ -369,50 +329,22 @@ texmf_other_scripts = \
latexindent/latexindent.pl \
latexmk/latexmk.pl \
latexpand/latexpand \
@@ -181,11 +181,11 @@ index 5bf620be..66dd7c24 100644
pkfix/pkfix.pl \
- pmxchords/pmxchords.lua \
- pst2pdf/pst2pdf.pl \
- ptex-fontmaps/kanji-config-updmap-sys.sh \
- ptex-fontmaps/kanji-config-updmap-user.sh \
- ptex-fontmaps/kanji-config-updmap.pl \
- ptex-fontmaps/kanji-fontmap-creator.pl \
- ptex2pdf/ptex2pdf.lua \
+- ptex-fontmaps/kanji-config-updmap-sys.sh \
+- ptex-fontmaps/kanji-config-updmap-user.sh \
+- ptex-fontmaps/kanji-config-updmap.pl \
+- ptex-fontmaps/kanji-fontmap-creator.pl \
+- ptex2pdf/ptex2pdf.lua \
purifyeps/purifyeps \
- pygmentex/pygmentex.py \
pythontex/depythontex.py \
@@ -198,7 +198,7 @@ index 5bf620be..66dd7c24 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +365,6 @@ texmf_other_scripts = \
+@@ -428,7 +360,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -206,7 +206,7 @@ index 5bf620be..66dd7c24 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +372,8 @@ texmf_other_scripts = \
+@@ -436,24 +367,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -232,7 +232,7 @@ index 5bf620be..66dd7c24 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +384,6 @@ bin_links = \
+@@ -464,7 +379,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-14 8:51 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-14 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 6fce43cda53a03a82ce787dd4395dfa4f69b0717
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 08:51:23 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 08:51:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=6fce43cd
update unbundle script more
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...001-tl-core-2020-unbundle-installed_scripts.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 72c4ad8..348b3ff 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,4 +1,4 @@
-From eeeb8457f722abba934b053dbd159ea7b4858a04 Mon Sep 17 00:00:00 2001
+From 102c159bb6c468929c06942e9ca8740aa8594bc7 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Mon, 13 Apr 2020 15:48:05 +0300
Subject: [PATCH] patch1
@@ -6,8 +6,8 @@ Subject: [PATCH] patch1
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/texlive/linked_scripts/Makefile.am | 4 --
- texk/texlive/linked_scripts/Makefile.in | 90 +------------------------
- 2 files changed, 2 insertions(+), 92 deletions(-)
+ texk/texlive/linked_scripts/Makefile.in | 91 +------------------------
+ 2 files changed, 2 insertions(+), 93 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..e762b72a 100644
+index 5bf620be..703bee70 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,25 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -82,7 +82,7 @@ index 5bf620be..e762b72a 100644
texlive-extra/texconfig-dialog.sh \
texlive-extra/texconfig-sys.sh \
texlive-extra/texconfig.sh \
-@@ -302,63 +295,30 @@ texmf_shell_scripts = \
+@@ -302,63 +295,29 @@ texmf_shell_scripts = \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -109,7 +109,7 @@ index 5bf620be..e762b72a 100644
clojure-pamphlet/pamphletangler \
cluttex/cluttex.lua \
- context/perl/mptopdf.pl \
- convbkmk/convbkmk.rb \
+- convbkmk/convbkmk.rb \
- crossrefware/bbl2bib.pl \
- crossrefware/bibdoiadd.pl \
- crossrefware/bibmradd.pl \
@@ -147,7 +147,7 @@ index 5bf620be..e762b72a 100644
latex-git-log/latex-git-log \
latex-papersize/latex-papersize.py \
latex2man/latex2man \
-@@ -369,50 +329,22 @@ texmf_other_scripts = \
+@@ -369,50 +328,22 @@ texmf_other_scripts = \
latexindent/latexindent.pl \
latexmk/latexmk.pl \
latexpand/latexpand \
@@ -198,7 +198,7 @@ index 5bf620be..e762b72a 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +360,6 @@ texmf_other_scripts = \
+@@ -428,7 +359,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -206,7 +206,7 @@ index 5bf620be..e762b72a 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +367,8 @@ texmf_other_scripts = \
+@@ -436,24 +366,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -232,7 +232,7 @@ index 5bf620be..e762b72a 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +379,6 @@ bin_links = \
+@@ -464,7 +378,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-20 12:11 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-20 12:11 UTC (permalink / raw
To: gentoo-commits
commit: 130dcbd36fa031647a230fd649e0c6c9250a61b3
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 12:10:30 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 12:10:30 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=130dcbd3
unbundle latexmk and co
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...1-tl-core-2020-unbundle-installed_scripts.patch | 35 ++++++++++++----------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 348b3ff..8858fae 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,13 +1,13 @@
-From 102c159bb6c468929c06942e9ca8740aa8594bc7 Mon Sep 17 00:00:00 2001
+From 8b8326b3fce8a44694ecfaee212c4706b419d493 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Mon, 13 Apr 2020 15:48:05 +0300
-Subject: [PATCH] patch1
+Date: Mon, 20 Apr 2020 15:08:06 +0300
+Subject: [PATCH] tl-core-2020: unbundle installed_scripts
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
- texk/texlive/linked_scripts/Makefile.am | 4 --
- texk/texlive/linked_scripts/Makefile.in | 91 +------------------------
- 2 files changed, 2 insertions(+), 93 deletions(-)
+ texk/texlive/linked_scripts/Makefile.am | 4 -
+ texk/texlive/linked_scripts/Makefile.in | 97 +------------------------
+ 2 files changed, 2 insertions(+), 99 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,10 +46,10 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..703bee70 100644
+index 5bf620be..4cfe0e11 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
-@@ -269,32 +269,25 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
+@@ -269,32 +269,24 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts
texmf_shell_scripts = \
adhocfilelist/adhocfilelist.sh \
@@ -63,7 +63,7 @@ index 5bf620be..703bee70 100644
listings-ext/listings-ext.sh \
ltxfileinfo/ltxfileinfo \
pdfbook2/pdfbook2 \
- pdfjam/pdfjam \
+- pdfjam/pdfjam \
pdftex-quiet/pdftex-quiet \
pdfxup/pdfxup \
- pst-pdf/ps4pdf \
@@ -82,7 +82,7 @@ index 5bf620be..703bee70 100644
texlive-extra/texconfig-dialog.sh \
texlive-extra/texconfig-sys.sh \
texlive-extra/texconfig.sh \
-@@ -302,63 +295,29 @@ texmf_shell_scripts = \
+@@ -302,117 +294,50 @@ texmf_shell_scripts = \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -136,7 +136,7 @@ index 5bf620be..703bee70 100644
- fontools/ot2kpx \
fragmaster/fragmaster.pl \
- getmap/getmapdl.lua \
- glossaries/makeglossaries \
+- glossaries/makeglossaries \
glossaries/makeglossaries-lite.lua \
- jfmutil/jfmutil.pl \
ketcindy/ketcindy.pl \
@@ -147,9 +147,12 @@ index 5bf620be..703bee70 100644
latex-git-log/latex-git-log \
latex-papersize/latex-papersize.py \
latex2man/latex2man \
-@@ -369,50 +328,22 @@ texmf_other_scripts = \
+ latex2nemeth/latex2nemeth \
+- latexdiff/latexdiff-vc.pl \
+- latexdiff/latexdiff.pl \
+- latexdiff/latexrevise.pl \
latexindent/latexindent.pl \
- latexmk/latexmk.pl \
+- latexmk/latexmk.pl \
latexpand/latexpand \
- lilyglyphs/lily-glyph-commands.py \
- lilyglyphs/lily-image-commands.py \
@@ -198,7 +201,7 @@ index 5bf620be..703bee70 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +359,6 @@ texmf_other_scripts = \
+@@ -428,7 +353,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -206,7 +209,7 @@ index 5bf620be..703bee70 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +366,8 @@ texmf_other_scripts = \
+@@ -436,24 +360,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -232,7 +235,7 @@ index 5bf620be..703bee70 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +378,6 @@ bin_links = \
+@@ -464,7 +372,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-20 12:46 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-20 12:46 UTC (permalink / raw
To: gentoo-commits
commit: d4fb59f4009bffed33fdf3fcd3fe2c3d5207e213
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 12:45:51 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 12:45:51 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=d4fb59f4
unbundle epspdf
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...001-tl-core-2020-unbundle-installed_scripts.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 8858fae..59109fc 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,13 +1,13 @@
-From 8b8326b3fce8a44694ecfaee212c4706b419d493 Mon Sep 17 00:00:00 2001
+From a924a46adc8161ac27095e4c70d31c465e520188 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Mon, 20 Apr 2020 15:08:06 +0300
+Date: Mon, 20 Apr 2020 15:44:27 +0300
Subject: [PATCH] tl-core-2020: unbundle installed_scripts
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/texlive/linked_scripts/Makefile.am | 4 -
- texk/texlive/linked_scripts/Makefile.in | 97 +------------------------
- 2 files changed, 2 insertions(+), 99 deletions(-)
+ texk/texlive/linked_scripts/Makefile.in | 98 +------------------------
+ 2 files changed, 2 insertions(+), 100 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..4cfe0e11 100644
+index 5bf620be..2c55809e 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,24 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -82,7 +82,7 @@ index 5bf620be..4cfe0e11 100644
texlive-extra/texconfig-dialog.sh \
texlive-extra/texconfig-sys.sh \
texlive-extra/texconfig.sh \
-@@ -302,117 +294,50 @@ texmf_shell_scripts = \
+@@ -302,117 +294,49 @@ texmf_shell_scripts = \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -125,7 +125,7 @@ index 5bf620be..4cfe0e11 100644
dviasm/dviasm.py \
dviinfox/dviinfox.pl \
- ebong/ebong.py \
- epspdf/epspdf.tlu \
+- epspdf/epspdf.tlu \
epspdf/epspdftk.tcl \
- epstopdf/epstopdf.pl \
- exceltex/exceltex \
@@ -201,7 +201,7 @@ index 5bf620be..4cfe0e11 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +353,6 @@ texmf_other_scripts = \
+@@ -428,7 +352,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -209,7 +209,7 @@ index 5bf620be..4cfe0e11 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +360,8 @@ texmf_other_scripts = \
+@@ -436,24 +359,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -235,7 +235,7 @@ index 5bf620be..4cfe0e11 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +372,6 @@ bin_links = \
+@@ -464,7 +371,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-20 16:05 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-20 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 1f0c03c7118179967ef119b28517ed432ec6e00a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 16:03:51 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 16:03:51 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=1f0c03c7
unbundle pdfannoextractor
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...001-tl-core-2020-unbundle-installed_scripts.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index 59109fc..cfbb793 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,13 +1,13 @@
-From a924a46adc8161ac27095e4c70d31c465e520188 Mon Sep 17 00:00:00 2001
+From d6034d36c8bd9b0620e6d98e5c46c592ac315ec2 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Mon, 20 Apr 2020 15:44:27 +0300
+Date: Mon, 20 Apr 2020 19:01:18 +0300
Subject: [PATCH] tl-core-2020: unbundle installed_scripts
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/texlive/linked_scripts/Makefile.am | 4 -
- texk/texlive/linked_scripts/Makefile.in | 98 +------------------------
- 2 files changed, 2 insertions(+), 100 deletions(-)
+ texk/texlive/linked_scripts/Makefile.in | 99 +------------------------
+ 2 files changed, 2 insertions(+), 101 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..2c55809e 100644
+index 5bf620be..6dbcb62a 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,24 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -82,7 +82,7 @@ index 5bf620be..2c55809e 100644
texlive-extra/texconfig-dialog.sh \
texlive-extra/texconfig-sys.sh \
texlive-extra/texconfig.sh \
-@@ -302,117 +294,49 @@ texmf_shell_scripts = \
+@@ -302,117 +294,48 @@ texmf_shell_scripts = \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -172,7 +172,7 @@ index 5bf620be..2c55809e 100644
- multibibliography/multibibliography.pl \
- musixtex/musixflx.lua \
- musixtex/musixtex.lua \
- pax/pdfannotextractor.pl \
+- pax/pdfannotextractor.pl \
pdfcrop/pdfcrop.pl \
pdflatexpicscale/pdflatexpicscale.pl \
- pedigree-perl/pedigree.pl \
@@ -201,7 +201,7 @@ index 5bf620be..2c55809e 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +352,6 @@ texmf_other_scripts = \
+@@ -428,7 +351,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -209,7 +209,7 @@ index 5bf620be..2c55809e 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +359,8 @@ texmf_other_scripts = \
+@@ -436,24 +358,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -235,7 +235,7 @@ index 5bf620be..2c55809e 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +371,6 @@ bin_links = \
+@@ -464,7 +370,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-04-22 17:10 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-22 17:10 UTC (permalink / raw
To: gentoo-commits
commit: c0643bed1eb2397c689e68094c4baa8fd01153d3
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 17:10:02 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 17:10:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=c0643bed
unbandle epspdftk
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
...1-tl-core-2020-unbundle-installed_scripts.patch | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
index cfbb793..f64df33 100644
--- a/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
+++ b/2020/patches/0001-tl-core-2020-unbundle-installed_scripts.patch
@@ -1,13 +1,13 @@
-From d6034d36c8bd9b0620e6d98e5c46c592ac315ec2 Mon Sep 17 00:00:00 2001
+From 494e8faa2c9ec70942faa45740b6ac4914360b56 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Mon, 20 Apr 2020 19:01:18 +0300
+Date: Wed, 22 Apr 2020 20:08:05 +0300
Subject: [PATCH] tl-core-2020: unbundle installed_scripts
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
- texk/texlive/linked_scripts/Makefile.am | 4 -
- texk/texlive/linked_scripts/Makefile.in | 99 +------------------------
- 2 files changed, 2 insertions(+), 101 deletions(-)
+ texk/texlive/linked_scripts/Makefile.am | 4 -
+ texk/texlive/linked_scripts/Makefile.in | 100 +-----------------------
+ 2 files changed, 2 insertions(+), 102 deletions(-)
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 92c8629d..9810d679 100644
@@ -46,7 +46,7 @@ index 92c8629d..9810d679 100644
urlbst/urlbst \
vpe/vpe.pl \
diff --git a/texk/texlive/linked_scripts/Makefile.in b/texk/texlive/linked_scripts/Makefile.in
-index 5bf620be..6dbcb62a 100644
+index 5bf620be..6a65a2e6 100644
--- a/texk/texlive/linked_scripts/Makefile.in
+++ b/texk/texlive/linked_scripts/Makefile.in
@@ -269,32 +269,24 @@ EXTRA_DIST = scripts.lst context/stubs/unix/ctxtools \
@@ -82,7 +82,7 @@ index 5bf620be..6dbcb62a 100644
texlive-extra/texconfig-dialog.sh \
texlive-extra/texconfig-sys.sh \
texlive-extra/texconfig.sh \
-@@ -302,117 +294,48 @@ texmf_shell_scripts = \
+@@ -302,117 +294,47 @@ texmf_shell_scripts = \
texosquery/texosquery.sh \
texosquery/texosquery-jre5.sh \
texosquery/texosquery-jre8.sh \
@@ -126,7 +126,7 @@ index 5bf620be..6dbcb62a 100644
dviinfox/dviinfox.pl \
- ebong/ebong.py \
- epspdf/epspdf.tlu \
- epspdf/epspdftk.tcl \
+- epspdf/epspdftk.tcl \
- epstopdf/epstopdf.pl \
- exceltex/exceltex \
- fig4latex/fig4latex \
@@ -201,7 +201,7 @@ index 5bf620be..6dbcb62a 100644
tex4ebook/tex4ebook \
texcount/texcount.pl \
texdef/texdef.pl \
-@@ -428,7 +351,6 @@ texmf_other_scripts = \
+@@ -428,7 +350,6 @@ texmf_other_scripts = \
texlive/mktexpk \
texlive/mktextfm \
texlive/rungs.tlu \
@@ -209,7 +209,7 @@ index 5bf620be..6dbcb62a 100644
texlive/updmap-sys.sh \
texlive/updmap-user.sh \
texlive/updmap.pl \
-@@ -436,24 +358,8 @@ texmf_other_scripts = \
+@@ -436,24 +357,8 @@ texmf_other_scripts = \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
texplate/texplate.sh \
@@ -235,7 +235,7 @@ index 5bf620be..6dbcb62a 100644
nobase_dist_texmf_scripts_SCRIPTS = \
$(texmf_shell_scripts) \
-@@ -464,7 +370,6 @@ bin_links = \
+@@ -464,7 +369,6 @@ bin_links = \
allcm:allec \
cluttex:clxelatex \
cluttex:cllualatex \
@@ -244,5 +244,5 @@ index 5bf620be..6dbcb62a 100644
kpsetool:kpsexpand \
kpsetool:kpsepath \
--
-2.24.1
+2.25.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/tex:master commit in: 2020/patches/
@ 2020-08-02 13:42 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-08-02 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 3cc369dcbfcb48261c60887795d5e021344a70d3
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 2 13:42:38 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Aug 2 13:42:38 2020 +0000
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=3cc369dc
add patch for prefexed strings calls
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
2020/patches/texlive-core-2020-strings.patch | 135 +++++++++++++++++++++++++++
1 file changed, 135 insertions(+)
diff --git a/2020/patches/texlive-core-2020-strings.patch b/2020/patches/texlive-core-2020-strings.patch
new file mode 100644
index 0000000..df96fd2
--- /dev/null
+++ b/2020/patches/texlive-core-2020-strings.patch
@@ -0,0 +1,135 @@
+--- a/libs/cairo/configure
++++ b/libs/cairo/configure
+@@ -700,6 +700,7 @@
+ build_TRUE
+ CAIRO_ATTRIBUTE_FLAG
+ VISIBILITY_CFLAGS
++STRINGS
+ LN_S
+ RANLIB
+ WARNING_CFLAGS
+@@ -5673,10 +5686,104 @@
+ if ac_fn_c_try_compile "$LINENO"; then :
+
+
+-if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then
++# allow users to override default 'strings' with 'llvm-strings'
++# or ${CHOST}-strings.
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strings", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strings; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_STRINGS+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$STRINGS"; then
++ ac_cv_prog_STRINGS="$STRINGS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_STRINGS="${ac_tool_prefix}strings"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++STRINGS=$ac_cv_prog_STRINGS
++if test -n "$STRINGS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRINGS" >&5
++$as_echo "$STRINGS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRINGS"; then
++ ac_ct_STRINGS=$STRINGS
++ # Extract the first word of "strings", so it can be a program name with args.
++set dummy strings; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_STRINGS+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_STRINGS"; then
++ ac_cv_prog_ac_ct_STRINGS="$ac_ct_STRINGS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_ac_ct_STRINGS="strings"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRINGS=$ac_cv_prog_ac_ct_STRINGS
++if test -n "$ac_ct_STRINGS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRINGS" >&5
++$as_echo "$ac_ct_STRINGS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_STRINGS" = x; then
++ STRINGS=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRINGS=$ac_ct_STRINGS
++ fi
++else
++ STRINGS="$ac_cv_prog_STRINGS"
++fi
++
++if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then
++if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else
+--- a/libs/cairo/m4/float.m4
++++ b/libs/cairo/m4/float.m4
+@@ -30,10 +30,13 @@
+
+ ]])], [
+
+-if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then
++# allow users to override default 'strings' with 'llvm-strings'
++# or ${CHOST}-strings.
++AC_CHECK_TOOL([STRINGS], [strings])
++if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then
++if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-08-02 13:43 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-20 12:11 [gentoo-commits] proj/tex:master commit in: 2020/patches/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2020-08-02 13:42 Mikle Kolyada
2020-04-22 17:10 Mikle Kolyada
2020-04-20 16:05 Mikle Kolyada
2020-04-20 12:46 Mikle Kolyada
2020-04-14 8:51 Mikle Kolyada
2020-04-14 7:52 Mikle Kolyada
2020-04-14 7:24 Mikle Kolyada
2020-04-13 21:31 Mikle Kolyada
2020-04-11 16:10 Mikle Kolyada
2020-04-11 13:30 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox