28 changed files with 6544 additions and 4469 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,6 +20,8 @@ SOURCES/anysize.doc.tar.xz
 SOURCES/anysize.tar.xz
 SOURCES/appendix.doc.tar.xz
 SOURCES/appendix.tar.xz
+SOURCES/arabxetex.doc.tar.xz
+SOURCES/arabxetex.tar.xz
 SOURCES/arphic.doc.tar.xz
 SOURCES/arphic.tar.xz
 SOURCES/atbegshi.doc.tar.xz
@ -86,6 +88,8 @@ SOURCES/chngcntr.doc.tar.xz
 SOURCES/chngcntr.tar.xz
 SOURCES/cite.doc.tar.xz
 SOURCES/cite.tar.xz
+SOURCES/cjk.doc.tar.xz
+SOURCES/cjk.tar.xz
 SOURCES/classpack.doc.tar.xz
 SOURCES/classpack.tar.xz
 SOURCES/cm-lgc.doc.tar.xz
@ -112,8 +116,6 @@ SOURCES/colortbl.doc.tar.xz
 SOURCES/colortbl.tar.xz
 SOURCES/context.doc.tar.xz
 SOURCES/context.tar.xz
-SOURCES/count1to.doc.tar.xz
-SOURCES/count1to.tar.xz
 SOURCES/courier.tar.xz
 SOURCES/crop.doc.tar.xz
 SOURCES/crop.tar.xz
@ -174,10 +176,6 @@ SOURCES/euro.doc.tar.xz
 SOURCES/euro.tar.xz
 SOURCES/eurosym.doc.tar.xz
 SOURCES/eurosym.tar.xz
-SOURCES/everysel.doc.tar.xz
-SOURCES/everysel.tar.xz
-SOURCES/everyshi.doc.tar.xz
-SOURCES/everyshi.tar.xz
 SOURCES/extsizes.doc.tar.xz
 SOURCES/extsizes.tar.xz
 SOURCES/fancybox.doc.tar.xz
@ -194,8 +192,6 @@ SOURCES/filehook.doc.tar.xz
 SOURCES/filehook.tar.xz
 SOURCES/finstrut.doc.tar.xz
 SOURCES/finstrut.tar.xz
-SOURCES/firstaid.doc.tar.xz
-SOURCES/firstaid.tar.xz
 SOURCES/fix2col.doc.tar.xz
 SOURCES/fix2col.tar.xz
 SOURCES/fixlatvian.doc.tar.xz
@ -215,6 +211,7 @@ SOURCES/fonts-tlwg.tar.xz
 SOURCES/fontspec.doc.tar.xz
 SOURCES/fontspec.tar.xz
 SOURCES/fontware.doc.tar.xz
+SOURCES/fontware.tar.xz
 SOURCES/fontwrap.doc.tar.xz
 SOURCES/fontwrap.tar.xz
 SOURCES/footmisc.doc.tar.xz
@ -253,14 +250,8 @@ SOURCES/hobsub.doc.tar.xz
 SOURCES/hobsub.tar.xz
 SOURCES/hologo.doc.tar.xz
 SOURCES/hologo.tar.xz
-SOURCES/hopatch.doc.tar.xz
-SOURCES/hopatch.tar.xz
 SOURCES/hycolor.doc.tar.xz
 SOURCES/hycolor.tar.xz
-SOURCES/hypcap.doc.tar.xz
-SOURCES/hypcap.tar.xz
-SOURCES/hypdoc.doc.tar.xz
-SOURCES/hypdoc.tar.xz
 SOURCES/hyperref.doc.tar.xz
 SOURCES/hyperref.tar.xz
 SOURCES/hyph-utf8.doc.tar.xz
@ -346,8 +337,6 @@ SOURCES/ltxcmds.tar.xz
 SOURCES/ltxmisc.tar.xz
 SOURCES/lua-alt-getopt.doc.tar.xz
 SOURCES/lua-alt-getopt.tar.xz
-SOURCES/lua-uni-algos.doc.tar.xz
-SOURCES/lua-uni-algos.tar.xz
 SOURCES/luahbtex.doc.tar.xz
 SOURCES/luahbtex.tar.xz
 SOURCES/lualatex-math.doc.tar.xz
@ -409,12 +398,12 @@ SOURCES/mparhack.doc.tar.xz
 SOURCES/mparhack.tar.xz
 SOURCES/mptopdf.doc.tar.xz
 SOURCES/mptopdf.tar.xz
+SOURCES/ms.doc.tar.xz
+SOURCES/ms.tar.xz
 SOURCES/multido.doc.tar.xz
 SOURCES/multido.tar.xz
 SOURCES/multirow.doc.tar.xz
 SOURCES/multirow.tar.xz
-SOURCES/multitoc.doc.tar.xz
-SOURCES/multitoc.tar.xz
 SOURCES/natbib.doc.tar.xz
 SOURCES/natbib.tar.xz
 SOURCES/ncctools.doc.tar.xz
@ -443,18 +432,12 @@ SOURCES/parallel.tar.xz
 SOURCES/parskip.doc.tar.xz
 SOURCES/parskip.tar.xz
 SOURCES/passivetex.tar.xz
-SOURCES/pdfcol.doc.tar.xz
-SOURCES/pdfcol.tar.xz
-SOURCES/pdfcolfoot.doc.tar.xz
-SOURCES/pdfcolfoot.tar.xz
 SOURCES/pdfcolmk.doc.tar.xz
 SOURCES/pdfcolmk.tar.xz
 SOURCES/pdfescape.doc.tar.xz
 SOURCES/pdfescape.tar.xz
 SOURCES/pdflscape.doc.tar.xz
 SOURCES/pdflscape.tar.xz
-SOURCES/pdfmanagement-testphase.doc.tar.xz
-SOURCES/pdfmanagement-testphase.tar.xz
 SOURCES/pdfpages.doc.tar.xz
 SOURCES/pdfpages.tar.xz
 SOURCES/pdftex.doc.tar.xz
@ -474,6 +457,8 @@ SOURCES/powerdot.doc.tar.xz
 SOURCES/powerdot.tar.xz
 SOURCES/preprint.doc.tar.xz
 SOURCES/preprint.tar.xz
+SOURCES/preview.doc.tar.xz
+SOURCES/preview.tar.xz
 SOURCES/psfrag.doc.tar.xz
 SOURCES/psfrag.tar.xz
 SOURCES/pslatex.tar.xz
@ -584,9 +569,12 @@ SOURCES/tex.doc.tar.xz
 SOURCES/tex.tar.xz
 SOURCES/tex4ht.doc.tar.xz
 SOURCES/tex4ht.tar.xz
-SOURCES/texlive-20240311-source-clean.tar.xz
+SOURCES/texlive-20200406-source-clean.tar.xz
 SOURCES/texlive-common.doc.tar.xz
+SOURCES/texlive-docindex.doc.tar.xz
+SOURCES/texlive-docindex.tar.xz
 SOURCES/texlive-en.doc.tar.xz
+SOURCES/texlive-en.tar.xz
 SOURCES/texlive-licenses.tar.xz
 SOURCES/texlive-msg-translations.tar.xz
 SOURCES/texlive-scripts-extra.doc.tar.xz
@ -645,6 +633,7 @@ SOURCES/uniquecounter.doc.tar.xz
 SOURCES/uniquecounter.tar.xz
 SOURCES/unisugar.doc.tar.xz
 SOURCES/unisugar.tar.xz
+SOURCES/updmap-map.tar.xz
 SOURCES/upquote.doc.tar.xz
 SOURCES/upquote.tar.xz
 SOURCES/url.doc.tar.xz
@ -667,6 +656,10 @@ SOURCES/wrapfig.doc.tar.xz
 SOURCES/wrapfig.tar.xz
 SOURCES/xcolor.doc.tar.xz
 SOURCES/xcolor.tar.xz
+SOURCES/xdvi.doc.tar.xz
+SOURCES/xdvi.tar.xz
+SOURCES/xecjk.doc.tar.xz
+SOURCES/xecjk.tar.xz
 SOURCES/xecolor.doc.tar.xz
 SOURCES/xecolor.tar.xz
 SOURCES/xecyr.doc.tar.xz
@ -681,13 +674,13 @@ SOURCES/xetex-itrans.doc.tar.xz
 SOURCES/xetex-itrans.tar.xz
 SOURCES/xetex-pstricks.doc.tar.xz
 SOURCES/xetex-pstricks.tar.xz
+SOURCES/xetex-tibetan.doc.tar.xz
+SOURCES/xetex-tibetan.tar.xz
 SOURCES/xetex.doc.tar.xz
 SOURCES/xetex.tar.xz
 SOURCES/xetexconfig.tar.xz
 SOURCES/xetexfontinfo.doc.tar.xz
 SOURCES/xetexfontinfo.tar.xz
-SOURCES/xfrac.doc.tar.xz
-SOURCES/xfrac.tar.xz
 SOURCES/xifthen.doc.tar.xz
 SOURCES/xifthen.tar.xz
 SOURCES/xkeyval.doc.tar.xz
@ -696,6 +689,7 @@ SOURCES/xltxtra.doc.tar.xz
 SOURCES/xltxtra.tar.xz
 SOURCES/xmltex.doc.tar.xz
 SOURCES/xmltex.tar.xz
+SOURCES/xmltexconfig.tar.xz
 SOURCES/xpatch.doc.tar.xz
 SOURCES/xpatch.tar.xz
 SOURCES/xstring.doc.tar.xz
--- a/.texlive.metadata
+++ b/.texlive.metadata
--- a/SOURCES/create-clean-texlive.sh
+++ b/SOURCES/create-clean-texlive.sh
@ -1,12 +1,12 @@
 #! /bin/sh
-v=20240311
+v=20200406
 s=texlive-$v-source.tar.xz
 p=${s%.tar.xz}

 # get the texlive original source
 if [ ! -f $s ] ; then
  echo download $s, please wait...
-  wget https://ctan.math.illinois.edu/systems/texlive/Source/$s
+  wget https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2020/$s
  if [ ! -f $s ] ; then
    echo download $s failed!
    exit 1
--- a/SOURCES/texlive-20180414-annocheck.patch
+++ b/SOURCES/texlive-20180414-annocheck.patch
@ -0,0 +1,11 @@
+--- texlive-20180414/source/libs/luajit/Makefile.in.annocheck	2018-01-10 01:37:05.000000000 +0100
+++ texlive-20180414/source/libs/luajit/Makefile.in	2019-01-11 22:45:34.503080977 +0100
+@@ -680,7 +680,7 @@
+ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
+ AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES) -U_FORTIFY_SOURCE
+ AM_CFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2) -Wall
+-AM_CCASFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2)
+AM_CCASFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2) -Wa,--generate-missing-build-notes=yes
+ SUBDIRS = . native include
+ lib_LTLIBRARIES = libtexluajit.la
+ libtexluajit_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(LUAJIT_LT_VERSINFO) $(LIBLUAJIT_LDEXTRA)
--- a/SOURCES/texlive-2019-py3-and-pep8.patch
+++ b/SOURCES/texlive-2019-py3-and-pep8.patch
@ -0,0 +1,39 @@
+diff -up ./doc/generic/enctex/unimap.py.py3 ./doc/generic/enctex/unimap.py
+--- ./doc/generic/enctex/unimap.py.py3	2019-08-18 08:52:49.201015107 -0400
+++ ./doc/generic/enctex/unimap.py	2019-08-18 08:54:08.301110903 -0400
+@@ -91,12 +91,12 @@ def linetype(line):
+         return LineType.Character, (int(line[:m.end()], 16),
+                                     line[m.end():].strip().lower())
+     if not line.startswith('\t'):
+-        raise ValueError, 'Queer line doesn\'t start with @ or Tab'
+        raise ValueError('Queer line doesn\'t start with @ or Tab')
+     line = line.strip()
+     if not line:
+         return LineType.Empty, None
+     if not LineType.map.has_key(line[0]):
+-        raise ValueError, 'Queer character info line (marker %s)' % line[0]
+        raise ValueError('Queer character info line (marker %s)' % line[0])
+     return line[0], line[1:].strip()
+ 
+ def utf8chars(u):
+@@ -132,7 +132,7 @@ while typ:
+         char = val
+     elif typ == LineType.TeX:
+         if not val.startswith('\\'):
+-            raise ValueError, '%s is not a control seq (U%X)' % (val, char[0])
+            raise ValueError('%s is not a control seq (U%X)' % (val, char[0]))
+         if sect:
+             fw.write('\n%% %s\n' % sect)
+             sect = None
+diff -up ./doc/generic/enctex/unimap.py.py3 ./doc/generic/enctex/unimap.py
+--- ./doc/generic/enctex/unimap.py.py3	2019-08-18 09:40:33.996050750 -0400
+++ ./doc/generic/enctex/unimap.py	2019-08-18 09:41:02.573362799 -0400
+@@ -48,8 +48,6 @@ database = 'unimap.txt'    # Input file
+ output = 'utf8raw.tex'   # Output file
+ 
+ # Compatibility with Pyhton-2.1
+-if not __builtins__.__dict__.has_key('True'):
+-    True = 1; False = 0
+ if not __builtins__.__dict__.has_key('file'):
+     file = open
+ if not __builtins__.__dict__.has_key('dict'):
--- a/SOURCES/texlive-20190410-dvisvgm-fix-libgs-detection.patch
+++ b/SOURCES/texlive-20190410-dvisvgm-fix-libgs-detection.patch
@ -0,0 +1,25 @@
+diff -up texlive-base-20190410/source/texk/dvisvgm/configure.ac.fix-libgs-detection texlive-base-20190410/source/texk/dvisvgm/configure.ac
+--- texlive-base-20190410/source/texk/dvisvgm/configure.ac.fix-libgs-detection	2019-03-10 14:21:29.000000000 -0400
+++ texlive-base-20190410/source/texk/dvisvgm/configure.ac	2019-05-23 19:07:30.447057345 -0400
+@@ -66,7 +66,8 @@ AS_IF([test "x$have_libgs" = "xno"],
+ 	# Ghostscript not found, check for dlopen
+ 	[AC_CHECK_LIB(dl, dlopen,,
+ 		[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
+-		[AC_MSG_WARN(PostScript support disabled)])])
+		[AC_MSG_WARN(PostScript support disabled)])],
+      [test "x$have_libgs" = "xyes"], [HAVE_LIBGS=1])
+ fi
+ 
+ if test -z "$HAVE_LIBGS" || test "$HAVE_LIBGS" -eq 0; then
+diff -up texlive-base-20190410/source/texk/dvisvgm/configure.fix-libgs-detection texlive-base-20190410/source/texk/dvisvgm/configure
+--- texlive-base-20190410/source/texk/dvisvgm/configure.fix-libgs-detection	2019-05-23 19:07:45.568703333 -0400
+++ texlive-base-20190410/source/texk/dvisvgm/configure	2019-05-23 19:09:31.341219687 -0400
+@@ -22013,6 +22013,8 @@ $as_echo "#define DISABLE_GS 1" >>confde
+ $as_echo "$as_me: WARNING: PostScript support disabled" >&2;}
+ fi
+ 
+elif test "x$have_libgs" = "xyes"; then :
+  HAVE_LIBGS=1
+ fi
+ fi
+ 
--- a/SOURCES/texlive-20190410-poppler-0.73.patch
+++ b/SOURCES/texlive-20190410-poppler-0.73.patch
@ -0,0 +1,249 @@
+diff -up texlive-base-20190410/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler-0.73 texlive-base-20190410/source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-base-20190410/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler-0.73	2019-05-23 15:50:17.849768543 -0400
+++ texlive-base-20190410/source/texk/web2c/pdftexdir/pdftoepdf.cc	2019-05-23 16:00:41.022262790 -0400
+@@ -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 *);
+ 
+-static void copyName(char *s)
+static void copyName(const char *s)
+ {
+     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()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+        && (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.
+@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object *
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
+            epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
+         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;
+     Ref ref;
+-    char *p;
+-    GString *s;
+    const char *p;
+    const GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+     } else if (obj->isInt()) {
+@@ -566,7 +566,7 @@ static void copyObject(Object * obj)
+         pdf_printf("%s", convertNumToPDF(obj->getNum()));
+     } else if (obj->isString()) {
+         s = obj->getString();
+-        p = s->getCString();
+        p = s->c_str();
+         l = s->getLength();
+         if (strlen(p) == (unsigned int) l) {
+             pdf_puts("(");
+@@ -664,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;
+@@ -683,7 +683,7 @@ static void writeEncodings()
+ }
+ 
+ // 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();
+@@ -715,7 +715,7 @@ read_pdf_info(char *image_name, char *pa
+ {
+     PdfDocument *pdf_doc;
+     Page *page;
+-    PDFRectangle *pagebox;
+    const PDFRectangle *pagebox;
+ #ifdef POPPLER_VERSION
+     int pdf_major_version_found, pdf_minor_version_found;
+ #else
+@@ -724,8 +724,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 +822,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;
+@@ -849,7 +849,7 @@ void write_epdf(void)
+     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");
+@@ -977,7 +977,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(dic1.getKey(i),
+                                   dic1.getValNF(i));
+             }
+ // end modification
+diff -up texlive-base-20190410/source/texk/web2c/pdftexdir/pdftosrc.cc.poppler-0.73 texlive-base-20190410/source/texk/web2c/pdftexdir/pdftosrc.cc
+--- texlive-base-20190410/source/texk/web2c/pdftexdir/pdftosrc.cc.poppler-0.73	2019-05-23 15:50:17.850768522 -0400
+++ texlive-base-20190410/source/texk/web2c/pdftexdir/pdftosrc.cc	2019-05-23 15:50:17.858768349 -0400
+@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
+             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) {
+@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
+             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)
+@@ -128,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");
+@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
+                 Object objStr, obj1, obj2;
+                 int nObjects, first, n;
+                 int localOffset = 0;
+-                Guint firstOffset;
+                unsigned int firstOffset;
+ 
+                 objStr = xref->fetch(e->offset, 0);
+                 assert(objStr.isStream());
+@@ -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();
+diff -up texlive-base-20190410/source/texk/web2c/xetexdir/pdfimage.cpp.poppler-0.73 texlive-base-20190410/source/texk/web2c/xetexdir/pdfimage.cpp
+--- texlive-base-20190410/source/texk/web2c/xetexdir/pdfimage.cpp.poppler-0.73	2018-12-25 00:48:22.000000000 -0500
+++ texlive-base-20190410/source/texk/web2c/xetexdir/pdfimage.cpp	2019-05-23 15:50:17.858768349 -0400
+@@ -78,26 +78,29 @@ pdf_get_rect(char* filename, int page_nu
+ 
+ 	Page*		page = doc->getCatalog()->getPage(page_num);
+ 
+-	const PDFRectangle*	r;
+	PDFRectangle*	r;
+	const PDFRectangle*	cr;
+ 	switch (pdf_box) {
+ 		default:
+ 		case pdfbox_crop:
+-			r = page->getCropBox();
+			cr = page->getCropBox();
+ 			break;
+ 		case pdfbox_media:
+-			r = page->getMediaBox();
+			cr = page->getMediaBox();
+ 			break;
+ 		case pdfbox_bleed:
+-			r = page->getBleedBox();
+			cr = page->getBleedBox();
+ 			break;
+ 		case pdfbox_trim:
+-			r = page->getTrimBox();
+			cr = page->getTrimBox();
+ 			break;
+ 		case pdfbox_art:
+-			r = page->getArtBox();
+			cr = page->getArtBox();
+ 			break;
+ 	}
+ 
+	r = new PDFRectangle (cr->x1, cr->y1, cr->x2, cr->y2);
+
+ 	int RotAngle = 0;
+ 	RotAngle = (int)page->getRotate() % 360;
+ 	if (RotAngle < 0)
+@@ -112,6 +115,7 @@ pdf_get_rect(char* filename, int page_nu
+ 	box->x  = 72.27 / 72 * my_fmin(r->x1, r->x2);
+ 	box->y  = 72.27 / 72 * my_fmin(r->y1, r->y2);
+ 
+	delete r;
+ 	delete doc;
+ 
+ 	return 0;
--- a/SOURCES/texlive-20200327-disable-more-failing-tests.patch
+++ b/SOURCES/texlive-20200327-disable-more-failing-tests.patch
@ -0,0 +1,142 @@
+diff -up texlive-base-20200327/source/texk/web2c/am/texmf.am.dt texlive-base-20200327/source/texk/web2c/am/texmf.am
+--- texlive-base-20200327/source/texk/web2c/am/texmf.am.dt	2019-12-17 14:24:59.000000000 -0500
+++ texlive-base-20200327/source/texk/web2c/am/texmf.am	2020-04-20 14:33:43.465656684 -0400
+@@ -75,7 +75,7 @@ DISTCLEANFILES += $(nodist_tex_SOURCES)
+ 
+ # TeX tests
+ #
+-tex_tests = triptest.test tests/write18-quote-test.pl tests/tex-closeout.test
+tex_tests = tests/write18-quote-test.pl tests/tex-closeout.test
+ triptest.log: tex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ tests/write18-quote-test.log tests/tex-closeout.test: tex$(EXEEXT)
+ EXTRA_DIST += $(tex_tests)
+@@ -203,7 +203,7 @@ DISTCLEANFILES += $(nodist_libmf_a_SOURC
+ 
+ # Metafont tests
+ #
+-mf_tests = mftraptest.test
+mf_tests =
+ mftraptest.log: mf$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
+ EXTRA_DIST += $(mf_tests)
+ if MF
+diff -up texlive-base-20200327/source/texk/web2c/eptexdir/am/eptex.am.dt texlive-base-20200327/source/texk/web2c/eptexdir/am/eptex.am
+--- texlive-base-20200327/source/texk/web2c/eptexdir/am/eptex.am.dt	2020-04-20 14:32:46.325851485 -0400
+++ texlive-base-20200327/source/texk/web2c/eptexdir/am/eptex.am	2020-04-20 14:34:20.015892398 -0400
+@@ -83,7 +83,7 @@ EXTRA_DIST += \
+ 
+ # e-pTeX Tests
+ #
+-eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test
+eptex_tests = eptexdir/epver.test
+ eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ eptexdir/pdfprimitive.log: eptex$(EXEEXT)
+ eptexdir/epver.log: eptex$(EXEEXT)
+diff -up texlive-base-20200327/source/texk/web2c/euptexdir/am/euptex.am.dt texlive-base-20200327/source/texk/web2c/euptexdir/am/euptex.am
+--- texlive-base-20200327/source/texk/web2c/euptexdir/am/euptex.am.dt	2020-04-20 14:32:46.326851464 -0400
+++ texlive-base-20200327/source/texk/web2c/euptexdir/am/euptex.am	2020-04-20 14:34:55.625147806 -0400
+@@ -84,7 +84,7 @@ EXTRA_DIST += \
+ 
+ # e-upTeX Tests
+ #
+-euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
+euptex_tests = euptexdir/eupver.test
+ euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ euptexdir/pdfprimitive.log: euptex$(EXEEXT)
+ euptexdir/eupver.log: euptex$(EXEEXT)
+diff -up texlive-base-20200327/source/texk/web2c/mfluadir/am/mflua.am.dt texlive-base-20200327/source/texk/web2c/mfluadir/am/mflua.am
+--- texlive-base-20200327/source/texk/web2c/mfluadir/am/mflua.am.dt	2017-04-16 06:11:22.000000000 -0400
+++ texlive-base-20200327/source/texk/web2c/mfluadir/am/mflua.am	2020-04-20 14:32:46.326851464 -0400
+@@ -110,7 +110,7 @@ EXTRA_DIST += \
+ 
+ # MFLua tests
+ #
+-mflua_tests = mfluadir/mfluatraptest.test
+mflua_tests =
+ mfluadir/mfluatraptest.log: mflua$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
+ EXTRA_DIST += $(mflua_tests)
+ 
+diff -up texlive-base-20200327/source/texk/web2c/mfluajitdir/am/mfluajit.am.dt texlive-base-20200327/source/texk/web2c/mfluajitdir/am/mfluajit.am
+--- texlive-base-20200327/source/texk/web2c/mfluajitdir/am/mfluajit.am.dt	2017-04-16 06:11:22.000000000 -0400
+++ texlive-base-20200327/source/texk/web2c/mfluajitdir/am/mfluajit.am	2020-04-20 14:32:46.326851464 -0400
+@@ -106,7 +106,7 @@ EXTRA_DIST += \
+ 
+ # MFLuaJIT tests
+ #
+-mfluajit_tests = mfluajitdir/mfluajittraptest.test
+mfluajit_tests =
+ mfluajitdir/mfluajittraptest.log: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
+ EXTRA_DIST += $(mfluajit_tests)
+ 
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/am/pdftex.am.dt texlive-base-20200327/source/texk/web2c/pdftexdir/am/pdftex.am
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/am/pdftex.am.dt	2020-04-20 14:32:46.326851464 -0400
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/am/pdftex.am	2020-04-20 14:35:48.451043188 -0400
+@@ -95,8 +95,8 @@ EXTRA_DIST += \
+ 
+ # pdfTeX tests
+ #
+-pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test \
+-  pdftexdir/pdfimage.test pdftexdir/expanded.test \
+pdftex_tests = pdftexdir/pdftex.test \
+  pdftexdir/expanded.test \
+   pdftexdir/tests/cnfline.test
+ 
+ pdftexdir/wprob.log pdftexdir/pdftex.log \
+diff -up texlive-base-20200327/source/texk/web2c/ptexdir/am/ptex.am.dt texlive-base-20200327/source/texk/web2c/ptexdir/am/ptex.am
+--- texlive-base-20200327/source/texk/web2c/ptexdir/am/ptex.am.dt	2020-04-20 14:32:46.327851443 -0400
+++ texlive-base-20200327/source/texk/web2c/ptexdir/am/ptex.am	2020-04-20 14:36:23.750305069 -0400
+@@ -168,7 +168,7 @@ EXTRA_DIST += \
+ 
+ # pTeX Tests
+ #
+-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
+ptex_tests = ptexdir/pver.test
+ ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ ptexdir/pver.log: ptex$(EXEEXT)
+ pweb_tests = \
+diff -up texlive-base-20200327/source/texk/web2c/uptexdir/am/uptex.am.dt texlive-base-20200327/source/texk/web2c/uptexdir/am/uptex.am
+--- texlive-base-20200327/source/texk/web2c/uptexdir/am/uptex.am.dt	2020-04-20 14:32:46.327851443 -0400
+++ texlive-base-20200327/source/texk/web2c/uptexdir/am/uptex.am	2020-04-20 14:36:53.266687857 -0400
+@@ -158,7 +158,7 @@ EXTRA_DIST += \
+ 	uptexdir/ChangeLog
+ 
+ # upTeX Tests
+-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test
+uptex_tests = uptexdir/upver.test
+ uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+ uptexdir/upver.log: uptex$(EXEEXT)
+ upweb_tests = \
+diff -up texlive-base-20200327/source/texk/web2c/xetexdir/am/xetex.am.dt texlive-base-20200327/source/texk/web2c/xetexdir/am/xetex.am
+--- texlive-base-20200327/source/texk/web2c/xetexdir/am/xetex.am.dt	2020-04-20 14:32:46.327851443 -0400
+++ texlive-base-20200327/source/texk/web2c/xetexdir/am/xetex.am	2020-04-20 14:37:13.223270564 -0400
+@@ -201,7 +201,6 @@ EXTRA_DIST += \
+ #
+ xetex_tests = \
+ 	xetexdir/xetex-filedump.test \
+-	xetexdir/xetex-bug73.test \
+ 	xetexdir/xetex.test
+ xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+ 
+diff -up texlive-base-20200327/source/texk/kpathsea/Makefile.am.dt texlive-base-20200327/source/texk/kpathsea/Makefile.am
+--- texlive-base-20200327/source/texk/kpathsea/Makefile.am.dt	2020-04-20 15:49:39.282325550 -0400
+++ texlive-base-20200327/source/texk/kpathsea/Makefile.am	2020-04-20 15:49:51.475074045 -0400
+@@ -275,7 +275,7 @@ uninstall-local:
+ AM_TESTS_ENVIRONMENT  = LN_S='$(LN_S)'; export LN_S;
+ AM_TESTS_ENVIRONMENT += LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
+ #
+-TESTS  = tests/cnfline.test tests/cnfnewline.test
+TESTS  = tests/cnfnewline.test
+ TESTS += tests/cnfnull.test tests/cnfprog.test
+ TESTS += tests/kpseaccess.test
+ TESTS += tests/kpsereadlink.test tests/kpsestat.test tests/kpsewhich.test
+diff -up texlive-base-20200327/source/texk/kpathsea/Makefile.in.dt texlive-base-20200327/source/texk/kpathsea/Makefile.in
+--- texlive-base-20200327/source/texk/kpathsea/Makefile.in.dt	2020-04-21 10:17:29.766949867 -0400
+++ texlive-base-20200327/source/texk/kpathsea/Makefile.in	2020-04-21 10:17:36.926798780 -0400
+@@ -858,7 +858,7 @@ dist_noinst_DATA = texmf.cnf
+ AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; \
+ 	LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
+ #
+-TESTS = tests/cnfline.test tests/cnfnewline.test tests/cnfnull.test \
+TESTS = tests/cnfnewline.test tests/cnfnull.test \
+ 	tests/cnfprog.test tests/kpseaccess.test \
+ 	tests/kpsereadlink.test tests/kpsestat.test \
+ 	tests/kpsewhich.test
--- a/SOURCES/texlive-20200327-new-poppler.patch
+++ b/SOURCES/texlive-20200327-new-poppler.patch
@ -0,0 +1,641 @@
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.newpoppler texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.newpoppler	2019-11-27 17:45:26.000000000 -0500
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc	2020-04-20 14:28:40.111986243 -0400
+@@ -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 G
+ 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.59.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://
+ #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
+@@ -212,18 +193,6 @@ static void delete_document(PdfDocument
+     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;
+    Object obj1;
+     copyName(obj->dictGetKey(i));
+     pdf_puts(" ");
+-    obj->dictGetValNF(i, &obj1);
+    obj1 = obj->dictGetValNF(i);
+     copyObject(&obj1);
+     pdf_puts("\n");
+ }
+@@ -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);
+        if (!procset.isName())
+             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+-                        procset->getTypeName());
+-        copyName(procset->getName());
+                        procset.getTypeName());
+        copyName(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 *
+     }
+     // 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");
+        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(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, charset.getString()->getCString());
+         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 *
+ 
+ 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())
+        fontRef = obj->dictGetValNF(i);
+        if (fontRef.isRef())
+             copyFont(obj->dictGetKey(i), &fontRef);
+-        else if (fontRef->isDict()) {   // some programs generate pdf with embedded font object
+        else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
+             copyName(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;
+@@ -601,8 +595,8 @@ static void copyObject(Object * obj)
+     } 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);
+            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();
+         }
+     }
+ }
+@@ -685,7 +676,7 @@ static void writeEncodings()
+ #ifdef POPPLER_VERSION
+         r->font->decRefCnt();
+ #else
+-        delete r->font;
+#error POPPLER_VERSION should be defined.
+ #endif
+         delete r;
+     }
+@@ -728,7 +719,7 @@ read_pdf_info(char *image_name, char *pa
+ #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) {
+@@ -760,19 +751,7 @@ read_pdf_info(char *image_name, char *pa
+         }
+     }
+ #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) {
+@@ -839,8 +818,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,8 +846,8 @@ 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;
+     // write the Page header
+@@ -886,7 +865,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();
+         if (info.isRef()) {
+             // the info dict must be indirect (PDF Ref p. 61)
+             pdf_printf("/%s.InfoDict ", pdfkeyprefix);
+@@ -942,14 +921,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");
+    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]);
+        if (!dictObj.isNull()) {
+             pdf_newline();
+             pdf_printf("/%s ", pageDictKeys[i]);
+             copyObject(&dictObj); // preserves indirection
+@@ -957,8 +936,8 @@ void write_epdf(void)
+     } 
+ 
+     // handle page group
+-    pageDict->lookupNF("Group", &dictObj);
+-    if (!dictObj->isNull()) {
+    dictObj = pageDict->lookupNF("Group");
+    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 +951,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(copyString(dic1.getKey(i)),
+                                  dic1.getValNF(i));
+            }
+// end modification
+             pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
+         }
+     }
+@@ -989,14 +993,14 @@ 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);
+            obj2 = obj1->dictGetVal(i);
+             key = obj1->dictGetKey(i);
+             if (strcmp("Font", key) == 0)
+                 copyFontResources(&obj2);
+@@ -1009,8 +1013,8 @@ void write_epdf(void)
+     }
+ 
+     // 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 +1025,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
+         }
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc.newpoppler texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc.newpoppler	2017-10-17 00:24:27.000000000 -0400
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc	2020-04-20 14:25:55.786266341 -0400
+@@ -16,6 +16,14 @@ GNU General Public License for more deta
+ 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.59.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://
+ #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>
+ 
+@@ -86,22 +91,20 @@ 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);
+        srcStream = catalogDict.dictLookup("SourceObject");
+         static char const_SourceFile[] = "SourceFile";
+         if (!srcStream.isStream(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);
+@@ -110,7 +113,7 @@ int main(int argc, char *argv[])
+         // 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);
+@@ -160,26 +163,24 @@ int main(int argc, char *argv[])
+                 int localOffset = 0;
+                 Guint 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);
+                str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
+                 lexer = new Lexer(xref, str);
+                 parser = new Parser(xref, lexer, gFalse);
+                 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) ;
+@@ -187,7 +188,6 @@ int main(int argc, char *argv[])
+                 lexer->skipToEOF();
+ #endif
+                 delete parser;
+-                objStr.free();
+ 
+                 fprintf(outfile, "%.10lu 00000 n\n",
+                         (long unsigned)(firstOffset + localOffset));
+@@ -198,7 +198,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 +206,6 @@ 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;
+ }
--- a/SOURCES/texlive-20200327-poppler-0.84.patch
+++ b/SOURCES/texlive-20200327-poppler-0.84.patch
@ -0,0 +1,266 @@
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler-0.84 texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler-0.84	2020-04-20 14:38:05.301181578 -0400
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc	2020-04-20 14:38:05.314181306 -0400
+@@ -26,6 +26,15 @@ The poppler should be 0.59.0 or newer ve
+ POPPLER_VERSION should be defined.
+ */
+ 
+#ifdef POPPLER_VERSION
+#include <poppler-config.h>
+#define xpdfVersion POPPLER_VERSION
+#define xpdfString "poppler"
+#else
+#include <xpdf/config.h>        /* just to get the xpdf version */
+#define xpdfString "xpdf"
+#endif
+
+ /* 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'.
+@@ -292,7 +301,7 @@ static void copyDictEntry(Object * obj,
+     Object obj1;
+     copyName(obj->dictGetKey(i));
+     pdf_puts(" ");
+-    obj1 = obj->dictGetValNF(i);
+    obj1 = obj->dictGetValNF(i).copy();
+     copyObject(&obj1);
+     pdf_puts("\n");
+ }
+@@ -351,7 +360,7 @@ static void copyProcSet(Object * obj)
+                     obj->getTypeName());
+     pdf_puts("/ProcSet [ ");
+     for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+-        procset = obj->arrayGetNF(i);
+        procset = obj->arrayGetNF(i).copy();
+         if (!procset.isName())
+             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+                         procset.getTypeName());
+@@ -406,7 +415,7 @@ static void copyFont(const char *tag, Ob
+     if (fontdict.isDict()) {
+         subtype = fontdict.dictLookup("Subtype");
+         basefont = fontdict.dictLookup("BaseFont");
+-        fontdescRef = fontdict.dictLookupNF("FontDescriptor");
+        fontdescRef = fontdict.dictLookupNF("FontDescriptor").copy();
+         if (fontdescRef.isRef()) {
+             fontdesc = fontdescRef.fetch(xref);
+         }
+@@ -452,7 +461,7 @@ static void copyFontResources(Object * o
+                     obj->getTypeName());
+     pdf_puts("/Font << ");
+     for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
+-        fontRef = obj->dictGetValNF(i);
+        fontRef = obj->dictGetValNF(i).copy();
+         if (fontRef.isRef())
+             copyFont(obj->dictGetKey(i), &fontRef);
+         else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
+@@ -595,7 +604,7 @@ static void copyObject(Object * obj)
+     } else if (obj->isArray()) {
+         pdf_puts("[");
+         for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
+-            obj1 = obj->arrayGetNF(i);
+            obj1 = obj->arrayGetNF(i).copy();
+             if (!obj1.isName())
+                 pdf_puts(" ");
+             copyObject(&obj1);
+@@ -723,7 +732,7 @@ read_pdf_info(char *image_name, char *pa
+ #endif
+     // initialize
+     if (!isInit) {
+-        globalParams = new GlobalParams();
+        globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
+         globalParams->setErrQuiet(false);
+         isInit = true;
+     }
+@@ -761,7 +770,7 @@ read_pdf_info(char *image_name, char *pa
+         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);
+@@ -921,13 +930,13 @@ void write_epdf(void)
+     pdf_puts(stripzeros(s));
+ 
+     // Metadata validity check (as a stream it must be indirect)
+-    dictObj = pageDict->lookupNF("Metadata");
+    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++) {
+-        dictObj = pageDict->lookupNF(pageDictKeys[i]);
+        dictObj = pageDict->lookupNF(pageDictKeys[i]).copy();
+         if (!dictObj.isNull()) {
+             pdf_newline();
+             pdf_printf("/%s ", pageDictKeys[i]);
+@@ -936,7 +945,7 @@ void write_epdf(void)
+     } 
+ 
+     // handle page group
+-    dictObj = pageDict->lookupNF("Group");
+    dictObj = pageDict->lookupNF("Group").copy();
+     if (!dictObj.isNull()) {
+         if (pdfpagegroupval == 0) { 
+             // another pdf with page group was included earlier on the
+@@ -978,7 +987,7 @@ The changes below seem to work fine.
+             l = dic1.getLength();
+             for (i = 0; i < l; i++) {
+                 groupDict.dictAdd(dic1.getKey(i),
+-                                  dic1.getValNF(i));
+                                  dic1.getValNF(i).copy());
+             }
+ // end modification
+             pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
+@@ -1108,6 +1117,6 @@ void epdf_check_mem()
+             delete_document(p);
+         }
+         // see above for globalParams
+-        delete globalParams;
+        globalParams.reset();
+     }
+ }
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc.poppler-0.84 texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc.poppler-0.84	2020-04-20 14:38:05.301181578 -0400
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftosrc.cc	2020-04-20 14:38:05.314181306 -0400
+@@ -24,6 +24,15 @@ by Arch Linux. The poppler should be 0.5
+ POPPLER_VERSION should be defined.
+ */
+ 
+#ifdef POPPLER_VERSION
+#include <poppler-config.h>
+#define xpdfVersion POPPLER_VERSION
+#define xpdfString "poppler"
+#else
+#include <xpdf/config.h>        /* just to get the xpdf version */
+#define xpdfString "xpdf"
+#endif
+
+ #include <w2c/config.h>
+ 
+ #include <stdlib.h>
+@@ -79,7 +88,7 @@ int main(int argc, char *argv[])
+         exit(1);
+     }
+     fileName = new GString(argv[1]);
+-    globalParams = new GlobalParams();
+    globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
+     doc = new PDFDoc(fileName);
+     if (!doc->isOk()) {
+         fprintf(stderr, "Invalid PDF file\n");
+@@ -100,7 +109,7 @@ int main(int argc, char *argv[])
+     if (objnum == 0) {
+         srcStream = catalogDict.dictLookup("SourceObject");
+         static char const_SourceFile[] = "SourceFile";
+-        if (!srcStream.isStream(const_SourceFile)) {
+        if (!(srcStream.isStream() && srcStream.getDict()->is(const_SourceFile))) {
+             fprintf(stderr, "No SourceObject found\n");
+             exit(1);
+         }
+@@ -156,7 +165,6 @@ int main(int argc, char *argv[])
+                         (e->type == xrefEntryFree ? "f" : "n"));
+             else {              // e->offset is the object number of the object stream
+                 Stream *str;
+-                Lexer *lexer;
+                 Parser *parser;
+                 Object objStr, obj1, obj2;
+                 int nObjects, first, n;
+@@ -174,8 +182,7 @@ int main(int argc, char *argv[])
+                 // parse the header: object numbers and offsets
+                 objStr.streamReset();
+                 str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
+-                lexer = new Lexer(xref, str);
+-                parser = new Parser(xref, lexer, false);
+                parser = new Parser(xref, str, false);
+                 for (n = 0; n < nObjects; ++n) {
+                     obj1 = parser->getObj();
+                     obj2 = parser->getObj();
+@@ -207,5 +214,5 @@ int main(int argc, char *argv[])
+         fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
+     fclose(outfile);
+     delete doc;
+-    delete globalParams;
+    globalParams.reset();
+ }
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/utils.c.poppler-0.84 texlive-base-20200327/source/texk/web2c/pdftexdir/utils.c
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/utils.c.poppler-0.84	2019-12-29 19:37:32.000000000 -0500
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/utils.c	2020-04-20 14:39:39.355214866 -0400
+@@ -32,14 +32,6 @@ with this program.  If not, see <http://
+ #include <zlib.h>
+ #include "ptexlib.h"
+ #include <png.h>
+-#ifdef POPPLER_VERSION
+-/* POPPLER_VERSION should be a proper version string */
+-#define xpdfVersion POPPLER_VERSION
+-#define xpdfString "poppler"
+-#else
+-#include <xpdf/config.h>        /* just to get the xpdf version */
+-#define xpdfString "xpdf"
+-#endif
+ 
+ #define check_nprintf(size_get, size_want) \
+     if ((unsigned)(size_get) >= (unsigned)(size_want)) \
+@@ -977,12 +969,10 @@ void initversionstring(char **versions)
+ {
+     const_string fmt =
+                     "Compiled with libpng %s; using libpng %s\n"
+-                    "Compiled with zlib %s; using zlib %s\n"
+-                    "Compiled with %s version %s\n";
+                    "Compiled with zlib %s; using zlib %s\n";
+     size_t len = strlen(fmt)
+                     + strlen(PNG_LIBPNG_VER_STRING) + strlen(png_libpng_ver)
+                     + strlen(ZLIB_VERSION) + strlen(zlib_version)
+-                    + strlen(xpdfString) + strlen(xpdfVersion)
+                     + 1;
+ 
+     /* len will be more than enough, because of the placeholder chars in fmt
+@@ -990,7 +980,7 @@ void initversionstring(char **versions)
+     *versions = xmalloc(len);
+     sprintf(*versions, fmt,
+                     PNG_LIBPNG_VER_STRING, png_libpng_ver,
+-                    ZLIB_VERSION, zlib_version, xpdfString, xpdfVersion);
+                    ZLIB_VERSION, zlib_version);
+ }
+ 
+ 
+diff -up texlive-base-20200327/source/texk/web2c/xetexdir/XeTeX_ext.c.poppler-0.84 texlive-base-20200327/source/texk/web2c/xetexdir/XeTeX_ext.c
+--- texlive-base-20200327/source/texk/web2c/xetexdir/XeTeX_ext.c.poppler-0.84	2019-12-30 16:00:39.000000000 -0500
+++ texlive-base-20200327/source/texk/web2c/xetexdir/XeTeX_ext.c	2020-04-20 14:40:44.534851910 -0400
+@@ -38,10 +38,6 @@ authorization from the copyright holders
+ 
+ #include <w2c/config.h>
+ 
+-#ifndef POPPLER_VERSION
+-#include <poppler-config.h>
+-#endif
+-
+ #include <png.h>
+ #include <zlib.h>
+ #include <graphite2/Font.h>
+@@ -170,7 +166,6 @@ void initversionstring(char **versions)
+         "Compiled with Graphite2 version %d.%d.%d; using %d.%d.%d\n"
+         "Compiled with HarfBuzz version %s; using %s\n"
+         "Compiled with libpng version %s; using %s\n"
+-        "Compiled with poppler version %s\n"
+ #ifdef XETEX_MAC
+         "Using Mac OS X Core Text and Cocoa frameworks\n"
+ #else
+@@ -187,7 +182,6 @@ void initversionstring(char **versions)
+             + strlen(hb_version_string())
+             + strlen(PNG_LIBPNG_VER_STRING)
+             + strlen(png_libpng_ver)
+-            + strlen(POPPLER_VERSION)
+ #ifndef XETEX_MAC
+             + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
+ #endif
+@@ -217,7 +211,7 @@ void initversionstring(char **versions)
+         GR2_VERSION_MAJOR, GR2_VERSION_MINOR, GR2_VERSION_BUGFIX,
+         grMajor, grMinor, grBugfix,
+         HB_VERSION_STRING, hb_version_string(),
+-        PNG_LIBPNG_VER_STRING, png_libpng_ver, POPPLER_VERSION
+        PNG_LIBPNG_VER_STRING, png_libpng_ver
+ #ifndef XETEX_MAC
+         ,
+         FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
--- a/SOURCES/texlive-20200327-poppler-0.90.patch
+++ b/SOURCES/texlive-20200327-poppler-0.90.patch
@ -0,0 +1,20 @@
+diff -up texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler090 texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc.poppler090	2020-07-14 13:13:31.620607263 -0400
+++ texlive-base-20200327/source/texk/web2c/pdftexdir/pdftoepdf.cc	2020-07-14 13:16:01.530248309 -0400
+@@ -766,7 +766,7 @@ read_pdf_info(char *image_name, char *pa
+     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();
+@@ -774,7 +774,6 @@ read_pdf_info(char *image_name, char *pa
+         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)
--- a/SOURCES/texlive-20200327-texinfo-path-fix.patch
+++ b/SOURCES/texlive-20200327-texinfo-path-fix.patch
@ -0,0 +1,22 @@
+diff -up texlive-base-20200327/source/texk/kpathsea/texmf.cnf.texinfo-fix texlive-base-20200327/source/texk/kpathsea/texmf.cnf
+--- texlive-base-20200327/source/texk/kpathsea/texmf.cnf.texinfo-fix	2020-04-20 14:29:38.934769870 -0400
+++ texlive-base-20200327/source/texk/kpathsea/texmf.cnf	2020-04-20 14:31:48.070069635 -0400
+@@ -83,6 +83,9 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
+ % to %USERPROFILE% on Windows, $HOME otherwise.
+ TEXMFHOME = ~/texmf
+ 
+% Texinfo on Fedora lives out of $TEXMFROOT
+TEXINFOHOME = $SELFAUTODIR/share/texmf
+
+ % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
+ TEXMFVAR = ~/.texlive2020/texmf-var
+ 
+@@ -108,7 +111,7 @@ TEXMFAUXTREES = {}
+ % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
+ % ever defined (the 99% common case), no extra elements will be added to
+ % the search paths. tlmgr takes care to end any value with a trailing comma.
+-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXINFOHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+ 
+ % Where to look for, and where mktexlsr creates, ls-R files. By default,
+ % this is all and only the !! elements of TEXMF, so that mktexlsr does not
--- a/SOURCES/texlive-2021-py3-and-pep8.patch
+++ b/SOURCES/texlive-2021-py3-and-pep8.patch
@ -1,761 +0,0 @@
-diff -up ./doc/fonts/gnu-freefont/tools/report/kernclasses.py.py3 ./doc/fonts/gnu-freefont/tools/report/kernclasses.py
--- ./doc/fonts/gnu-freefont/tools/report/kernclasses.py.py3	2019-08-18 08:17:06.470597138 -0400
-+++ ./doc/fonts/gnu-freefont/tools/report/kernclasses.py	2019-08-18 08:27:48.164149606 -0400
-@@ -16,10 +16,10 @@ def get_kern_subtables( font ):
- 					if font.isKerningClass( st ):
- 						tables.append( st )
- 		return tables
-	except EnvironmentError, ( e ):
-		print >> sys.stderr, 'EnvironmentError ' + str( e )
-	except TypeError, ( t ):
-		print >> sys.stderr, 'TypeError ' + str( t )
-+	except EnvironmentError as e:
-+		print('EnvironmentError ' + str( e ), file=sys.stderr)
-+	except TypeError as t:
-+		print('TypeError ' + str( t ), file=sys.stderr)
- 	return None
- preamble = """
- <html>
-@@ -46,20 +46,20 @@ postamble="""
- 
- def print_kerns( fontPath ):
- 	font = fontforge.open( fontPath )
-	print  '<h2>Kerning classes in  ' + font.fontname + '</h2>'
-+	print('<h2>Kerning classes in  ' + font.fontname + '</h2>')
- 	weight = ''
- 	if font.os2_weight > 500:
- 		weight = 'B'
- 	style = ''
- 	if font.italicangle < 0.0:
- 		style = 'I'
-	print  '<div  style="font-family: ' + font.familyname + '" '  \
-		+ 'class="' + weight + style + '">'
-+	print('<div  style="font-family: ' + font.familyname + '" '  \
-+		+ 'class="' + weight + style + '">')
- 	subtables = get_kern_subtables( font )
- 	for st in subtables:
-		print  '<h3>Subtable ' + st + '</h3>'
-+		print('<h3>Subtable ' + st + '</h3>')
- 		printKernsOfSubtable( font, st )
-	print  '</div>'
-+	print('</div>')
- 	sys.stdout.flush()
- 
- def printKernsOfSubtable( font, subtable ):
-@@ -69,38 +69,38 @@ def printKernsOfSubtable( font, subtable
- 	rightclasses = kclass[1]
- 	kerns = kclass[2]
- 	nr = len( rightclasses )
-	print '<table class="classes"><tr>'
-	print '<th>left classes: </th>'
-	print '<th>right classes: </th>'
-	print '<tr><td>'
-+	print('<table class="classes"><tr>')
-+	print('<th>left classes: </th>')
-+	print('<th>right classes: </th>')
-+	print('<tr><td>')
- 	for lc in leftclasses:
- 		if lc:
- 			for c in lc:
- 				printentity( font, c )
-		print "<br />"
-	print "</td>"
-	print "<td>"
-+		print("<br />")
-+	print("</td>")
-+	print("<td>")
- 	for rc in rightclasses:
- 		if rc:
- 			for c in rc:
- 				printentity( font, c )
-		print "<br />"
-	print "</td>"
-	print "</tr>"
-	print "</table>"
-	print "<table>"
-	print "<tr>"
-	print "<th></th>"
-+		print("<br />")
-+	print("</td>")
-+	print("</tr>")
-+	print("</table>")
-+	print("<table>")
-+	print("<tr>")
-+	print("<th></th>")
- 	for rc in rightclasses:
- 		if rc:
- 			sys.stdout.write( "<th>" )
- 			printentity( font, rc[0] )
- 			sys.stdout.write( "</th>" )
-	print "</tr>"
-+	print("</tr>")
- 	for lc in leftclasses:
- 		m = 0
- 		if lc:
-			print "<tr>"
-+			print("<tr>")
- 			sys.stdout.write( "<th>" )
- 			printentity( font, lc[0] )
- 			sys.stdout.write( "</th>" )
-@@ -122,18 +122,18 @@ def printKernsOfSubtable( font, subtable
- 					printpair( font, lc[0], rc[0] )
- 					sys.stdout.write( '</td>' )
- 				m += 1
-			print "</tr>"
-+			print("</tr>")
- 		n += 1
-	print "</table>"
-+	print("</table>")
- 
- def printentity( font, a ):
- 	s = font.findEncodingSlot( a )
- 	v = formatted_hex_value( s )
- 	if s == -1:
- 		v = '<span class="nonexistent">&nbsp;</span>'
-		print >> sys.stderr, font.fullname, 'Missing glyph: ' + a
-+		print(font.fullname, 'Missing glyph: ' + a, file=sys.stderr)
- 	elif not codepointIsInSomeRange( s ):
-		print >> sys.stderr, font.fullname, 'Non-unicode: ' + v
-+		print(font.fullname, 'Non-unicode: ' + v, file=sys.stderr)
- 	sys.stdout.write( v )
- 
- def printpair( font, p, q ):
-@@ -150,9 +150,9 @@ def printlist( lst ):
- 	for m in lst:
- 		s += delim + m
- 		delim = ' '
-	print s
-+	print(s)
- 
-print preamble
-+print(preamble)
- #print_kerns( '/home/swhite/font_stuff/urwsr-ttf/URWPalladioL-Roman-test.sfd' )
- print_kerns( '../../sfd/FreeSerif.sfd' )
- print_kerns( '../../sfd/FreeSerifItalic.sfd' )
-@@ -166,4 +166,4 @@ print_kerns( '../../sfd/FreeMono.sfd' )
- print_kerns( '../../sfd/FreeMonoOblique.sfd' )
- print_kerns( '../../sfd/FreeMonoBold.sfd' )
- print_kerns( '../../sfd/FreeMonoBoldOblique.sfd' )
-print postamble
-+print(postamble)
-diff -up ./doc/fonts/gnu-freefont/tools/report/ligatureLookups.py.py3 ./doc/fonts/gnu-freefont/tools/report/ligatureLookups.py
--- ./doc/fonts/gnu-freefont/tools/report/ligatureLookups.py.py3	2019-08-18 08:30:22.164442327 -0400
-+++ ./doc/fonts/gnu-freefont/tools/report/ligatureLookups.py	2019-08-18 08:33:04.545533305 -0400
-@@ -60,10 +60,10 @@ def get_ligature_lookups( font ):
- 				for st in sts:
- 					tables.append( st )
- 		return tables
-	except EnvironmentError, ( e ):
-		print >> stderr, 'EnvironmentError ' + str( e )
-	except TypeError, ( t ):
-		print >> stderr, 'TypeError ' + str( t )
-+	except EnvironmentError as e:
-+		print('EnvironmentError ' + str( e ), file=stderr)
-+	except TypeError as t:
-+		print('TypeError ' + str( t ), file=stderr)
- 	return None
- 
- _preamble= """<?xml version="1.0" encoding="utf-8"?>
-@@ -105,8 +105,8 @@ def print_ligatures( fontPath ):
- 	if font.weight == 'Bold':
- 		weight = "font-weight: bold; "
- 
-	print _style_div_html % ( font.familyname, style, weight )
-	print _lig_header_html % ( font.fontname )
-+	print(_style_div_html % ( font.familyname, style, weight ))
-+	print(_lig_header_html % ( font.fontname ))
- 
- 	subtable_names = get_ligature_lookups( font )
- 	for subtable_name in subtable_names:
-@@ -115,7 +115,7 @@ def print_ligatures( fontPath ):
- 		out = htmlListOfLigSubtable( font, subtable, subtables )
- 		stdout.writelines( out )
- 		stdout.flush()
-	print '</div>'
-+	print('</div>')
- 
- class Ligature:
- 	def __init__( self, glyph ):
-@@ -184,7 +184,7 @@ def makeLigatureSubtable( font, subtable
- 			ligature = Ligature( g )
- 			for lr in ligs:
- 				if len( lr ) < 3 or lr[1] != 'Ligature':
-					print >> stderr, font.fullname, '- non-ligature: ', g.glyphname
-+					print(font.fullname, '- non-ligature: ', g.glyphname, file=stderr)
- 					break
- 				i = 2
- 				while i < len( lr ):
-@@ -242,11 +242,11 @@ def nestedEntity( font, subtable, a, sub
- 	if s >= 0xe000 and s <= 0xf8ff:	# Unicode only
- 		lig = findLigatureGlyph( s, subtables )
- 		if lig:
-			#print >> stderr, 'Nested glyph found: ' + a
-+			#print('Nested glyph found: ' + a, file=stderr)
- 			for p in lig.parts:
- 				return nestedEntity( font, subtable, p, subtables )
- 		else:
-			print >> stderr, font.fullname, '- No nested glyph: ', a
-+			print(font.fullname, '- No nested glyph: ', a, file=stderr)
- 			return '<span class="nonchar">&nbsp;</span>'
- 	else:
- 		return entityHTML( font, a )
-@@ -254,7 +254,7 @@ def nestedEntity( font, subtable, a, sub
- def entityHTML( font, a ):
- 	s = font.findEncodingSlot( a )
- 	if s == -1:
-		print >> stderr, font.fullname, '- Missing glyph: ', a
-+		print(font.fullname, '- Missing glyph: ', a, file=stderr)
- 		return '<span class="nonchar">&nbsp;</span>'
- 	else:
- 		return formatted_hex_value( s )
-@@ -266,11 +266,11 @@ def formatted_hex_value( n ):
- args = argv[1:]
- 
- if len( args ) < 1 or len( args[0].strip() ) == 0:
-	print >> stderr, __usage
-+	print(__usage, file=stderr)
- 	exit( 0 )
- 
-print _preamble
-+print(_preamble)
- for font_name in args:
- 	print_ligatures( font_name )
-print _postamble
-+print(_postamble)
- 
-diff -up ./doc/fonts/gnu-freefont/tools/report/private_use.py.py3 ./doc/fonts/gnu-freefont/tools/report/private_use.py
--- ./doc/fonts/gnu-freefont/tools/report/private_use.py.py3	2019-08-18 08:33:25.445030197 -0400
-+++ ./doc/fonts/gnu-freefont/tools/report/private_use.py	2019-08-18 08:35:14.606402370 -0400
-@@ -48,32 +48,32 @@ postamble="""
- def print_private( fontPath ):
- 	font = fontforge.open( fontPath )
- 
-	print  '<div style="font-family: \'' + font.familyname + '\'; ' \
-			 '\">'
-	print  '<h2>Private Use Area in  ' + font.fontname + '</h2>'
-+	print('<div style="font-family: \'' + font.familyname + '\'; ' \
-+			 '\">')
-+	print('<h2>Private Use Area in  ' + font.fontname + '</h2>')
- 
- 	font.selection.select(("ranges",None),0xe000,0xf8ff)
-	print  '<table>'
-+	print('<table>')
- 	for g in font.selection.byGlyphs:
-		print  '<tr><td>'
-		print '%s%0.4x%s' %( "0x", g.encoding, "" )
-		print  '</td><td>'
-		print  '' + g.glyphname
-		print  '</td><td>'
-+		print('<tr><td>')
-+		print('%s%0.4x%s' %( "0x", g.encoding, "" ))
-+		print('</td><td>')
-+		print('' + g.glyphname)
-+		print('</td><td>')
- 		if g.getPosSub( '*' ):
-			print "is ligature"
-+			print("is ligature")
- 		if g.references:
-			print "has references"
-		print  '</td><td>'
-		print  '</td></tr>'
-+			print("has references")
-+		print('</td><td>')
-+		print('</td></tr>')
- 		
-	print  '</table>'
-	print  '</div>'
-+	print('</table>')
-+	print('</div>')
- 	sys.stdout.flush()
- 
- def printentity( font, s ):
- 	if s == -1:
-		print >> sys.stderr, 'Missing glyph: ' + a
-+		print('Missing glyph: ' + a, file=sys.stderr)
- 		sys.stdout.write( '<span class="nonchar">&nbsp;</span>' )
- 	else:
- 		sys.stdout.write( formatted_hex_value( s ) )
-@@ -86,7 +86,7 @@ args = sys.argv[1:]
- if len( args ) < 1 or len( args[0].strip() ) == 0:
- 	sys.exit( 0 )
- 
-print makePreamble()
-+print(makePreamble())
- for font_name in args:
- 	print_private( font_name )
-print postamble
-+print(postamble)
-diff -up ./doc/fonts/gnu-freefont/tools/report/range_report.py.py3 ./doc/fonts/gnu-freefont/tools/report/range_report.py
--- ./doc/fonts/gnu-freefont/tools/report/range_report.py.py3	2019-08-18 08:35:42.417732872 -0400
-+++ ./doc/fonts/gnu-freefont/tools/report/range_report.py	2019-08-18 08:39:50.949749956 -0400
-@@ -63,8 +63,8 @@ def count_glyphs_in_intervals( font, int
- 				for e in g:
- 					num += 1
- 			except ValueError:
-				print >> stderr, "interval " + str( r ) \
-				+ " not representable in " + font.fontname
-+				print("interval " + str( r ) \
-+				+ " not representable in " + font.fontname, file=stderr)
- 				exit( 1 )
- 	return num
- 
-@@ -96,7 +96,7 @@ class FontSupport:
- 
- 		r = font.os2_unicoderanges
- 
-		# print >> stderr, font.fontname, hex( r[0] ), hex( r[1] ),hex( r[2] ),hex( r[3] );
-+		# print(font.fontname, hex( r[0] ), hex( r[1] ),hex( r[2] ),hex( r[3] ), file=stderr);
- 
- 		nRanges = len( ulUnicodeRange )
- 
-@@ -111,16 +111,16 @@ class FontSupport:
- 			cp = g.encoding
- 			if ( not codepointIsInSomeRange( cp )
- 				and not codepointIsSpecialTT( cp ) ):
-				print >> stderr, font.fontname, \
-					"no range for", hex( cp )
-+				print(font.fontname, \
-+					"no range for", hex( cp ), file=stderr)
- 
- 		""" '''Would like to check that special TT slots are
- 		present, but don't know how...'''
- 		for cp in special_TT_points:
- 			font.selection.all()
- 			if not cp in font.selection.byGlyphs:
-				print >> stderr, font.fontname, \
-					"special TT glyph missing", hex( cp )
-+				print(font.fontname, \
-+					"special TT glyph missing", hex( cp ), file=stderr)
- 		"""
- 
- 	def collectRangeInfo( self, font, os2supportbyte, bit, index ):
-@@ -135,13 +135,13 @@ class FontSupport:
- 
- 	def setRangeSupport( self, idx, supports, total ):
- 		if self.myInfos.has_key( idx ):
-			print >> stderr, "OS/2 index ", idx, " duplicated"
-+			print("OS/2 index ", idx, " duplicated", file=stderr)
- 			exit( 1 )
- 		self.myInfos[idx] = SupportInfo( idx, supports, total )
- 
- 	def getInfo( self, idx ):
- 		if not self.myInfos.has_key( idx ):
-			print >> stderr, "OS/2 index ", idx, " not found"
-+			print("OS/2 index ", idx, " not found", file=stderr)
- 			exit( 1 )
- 		return self.myInfos[ idx ]
- 
-@@ -177,7 +177,7 @@ def print_font_range_table( fontSupportL
- 	headings = ''
- 	for fsl in fontSupportList:
- 		headings += '<th colspan="2">' + fsl.short + '</th>' 
-	print table_head % ( headings )
-+	print(table_head % ( headings ))
- 
- 	for r in ulUnicodeRange:
- 		idx = r[0]
-@@ -190,10 +190,10 @@ def print_font_range_table( fontSupportL
- 		if idx == 60 or idx == 90:
- 			rowclass = ' class="private"'
- 			
-		print '<tr%s><td>%s</td>' % ( rowclass, range_name )
-		print '<td class="num">%i</td>' % (
-				total_intervals( intervals ) )
-		print '<td></td>' 
-+		print('<tr%s><td>%s</td>' % ( rowclass, range_name ))
-+		print('<td class="num">%i</td>' % (
-+				total_intervals( intervals ) ))
-+		print('<td></td>')
- 		for fsl in fontSupportList:
- 			supportInfo = fsl.getInfo( idx )
- 			supportString = ''
-@@ -203,28 +203,28 @@ def print_font_range_table( fontSupportL
- 			if supportInfo.total:
- 				totalStr = str( supportInfo.total )
- 
-			print '<td class="num">%s</td><td>%s</td>' % (
-					totalStr, supportString )
-+			print('<td class="num">%s</td><td>%s</td>' % (
-+					totalStr, supportString ))
- 
-		print '</tr>'
-	print '<tr><th colspan="3">total in Unicode ranges</th>' 
-+		print('</tr>')
-+	print('<tr><th colspan="3">total in Unicode ranges</th>')
- 	for fsl in fontSupportList:
-		print '<td class="num" colspan="2">%i&nbsp;</td>' % (
-					fsl.totalGlyphs )
-	print '</tr>'
-	print '<tr><th colspan="3">total in font</th>' 
-+		print('<td class="num" colspan="2">%i&nbsp;</td>' % (
-+					fsl.totalGlyphs ))
-+	print('</tr>')
-+	print('<tr><th colspan="3">total in font</th>')
- 	for fsl in fontSupportList:
-		print '<td class="num" colspan="2">%i&nbsp;</td>' % (
-					fsl.fontTotalGlyphs )
-	print '</tr>'
-	print '<tr><th colspan="3">total in Private Use</th>' 
-+		print('<td class="num" colspan="2">%i&nbsp;</td>' % (
-+					fsl.fontTotalGlyphs ))
-+	print('</tr>')
-+	print('<tr><th colspan="3">total in Private Use</th>')
- 	for fsl in fontSupportList:
-		print '<td class="num" colspan="2">%i&nbsp;</td>' % (
-					fsl.privateUseGlyphs )
-	print '</tr>'
-+		print('<td class="num" colspan="2">%i&nbsp;</td>' % (
-+					fsl.privateUseGlyphs ))
-+	print('</tr>')
- 	# Would also like to total glyphs in ranges for each font,
- 	# and also print total glyphs in each font.
-	print '</table>'
-+	print('</table>')
- 
- table_introduction = """
- For historical reasons, TrueType classifies Unicode ranges according to
-@@ -286,25 +286,25 @@ Gnu FreeFont character range support
- '''
- 
- def print_font_range_report( fontSupportList ):
-	print html_heading
-+	print(html_heading)
- 
-	print '<body>'
-	print '<h1>'
-	print 'Gnu FreeFont support for OpenType OS/2 character ranges'
-	print '</h1>'
-	print '<p>'
-	print table_introduction
-	print '</p>'
-+	print('<body>')
-+	print('<h1>')
-+	print('Gnu FreeFont support for OpenType OS/2 character ranges')
-+	print('</h1>')
-+	print('<p>')
-+	print(table_introduction)
-+	print('</p>')
- 	print_font_range_table( fontSupportList )
-	print '<p>'
-	print table_explanation
-+	print('<p>')
-+	print(table_explanation)
- 	tzset()
-	print 'Generated by <code>range_report.py</code> on %s.' % (
-			strftime('%X %x %Z') )
-	print '</p>'
-	print '</body>'
-+	print('Generated by <code>range_report.py</code> on %s.' % (
-+			strftime('%X %x %Z') ))
-+	print('</p>')
-+	print('</body>')
- 
-	print '</html>'
-+	print('</html>')
- 
- supportList = []
- supportList.append( FontSupport( '../../sfd/FreeSerif.sfd', 'Srf' ) )
-diff -up ./doc/fonts/gnu-freefont/tools/script-menu/nameBySlot.py.py3 ./doc/fonts/gnu-freefont/tools/script-menu/nameBySlot.py
--- ./doc/fonts/gnu-freefont/tools/script-menu/nameBySlot.py.py3	2019-08-18 08:40:25.964907029 -0400
-+++ ./doc/fonts/gnu-freefont/tools/script-menu/nameBySlot.py	2019-08-18 08:41:02.911017630 -0400
-@@ -38,7 +38,7 @@ import fontforge
- 
- def explain_error_and_quit( e ):
- 	if e:
-		print 'Error: ', e
-+		print('Error: ', e)
- 	exit( 1 )
- 
- try:
-@@ -54,9 +54,9 @@ try:
- 			newname = 'uni%0.7x' %( g.encoding )
- 		elif g.encoding <= 0xFFFFFFFF:
- 			newname = 'uni%0.8x' %( g.encoding )
-		print "naming " + str( g.glyphname ) + ' as ' + newname
-+		print("naming " + str( g.glyphname ) + ' as ' + newname)
- 		g.glyphname =  newname
- 		g.unicode = g.encoding
-except ValueError, e:
-+except ValueError as e:
- 	explain_error_and_quit( e )
- 
-diff -up ./doc/fonts/gnu-freefont/tools/script-menu/unnameBySlot.py.py3 ./doc/fonts/gnu-freefont/tools/script-menu/unnameBySlot.py
--- ./doc/fonts/gnu-freefont/tools/script-menu/unnameBySlot.py.py3	2019-08-18 08:41:15.963703405 -0400
-+++ ./doc/fonts/gnu-freefont/tools/script-menu/unnameBySlot.py	2019-08-18 08:42:15.186277750 -0400
-@@ -39,16 +39,16 @@ import fontforge
- 
- def explain_error_and_quit( e ):
- 	if e:
-		print 'Error: ', e
-+		print('Error: ', e)
- 	exit( 1 )
- 
- try:
- 	glyphs = fontforge.activeFont().selection.byGlyphs
- 	for g in glyphs:
- 		newname = 'NameMe.%s' %( str( g.encoding ) )
-		print "naming " + str( g.glyphname ) + ' as ' + newname
-+		print("naming " + str( g.glyphname ) + ' as ' + newname)
- 		g.glyphname =  newname
- 		g.unicode = -1
-except ValueError, e:
-+except ValueError as e:
- 	explain_error_and_quit( e )
- 
-diff -up ./doc/fonts/gnu-freefont/tools/test/checkGlyphNumbers.py.py3 ./doc/fonts/gnu-freefont/tools/test/checkGlyphNumbers.py
--- ./doc/fonts/gnu-freefont/tools/test/checkGlyphNumbers.py.py3	2019-08-18 08:42:25.687024974 -0400
-+++ ./doc/fonts/gnu-freefont/tools/test/checkGlyphNumbers.py	2019-08-18 08:43:16.562800246 -0400
-@@ -53,12 +53,12 @@ def isSpecialTrueType( glyph ):
- from os import path
- def checkGlyphNumbers( fontDir, fontFile ):
- 	if isinstance( fontFile, ( list, tuple ) ):
-		print "In directory " + fontDir
-+		print("In directory " + fontDir)
- 		for fontName in fontFile:
- 			checkGlyphNumbers( fontDir, fontName )
- 		return
- 
-	print "Checking slot numbers in " + fontFile
-+	print("Checking slot numbers in " + fontFile)
- 	font = fontforge.open( path.join( fontDir, fontFile ) )
- 
- 	g = font.selection.all()
-@@ -71,13 +71,13 @@ def checkGlyphNumbers( fontDir, fontFile
- 			pass
- 		elif inPrivateUseRange( glyph ):
- 			if glyph.unicode != -1:
-				print "Glyph at slot " + str( glyph.encoding ) \
-					+ " is Private Use but has Unicode"
-+				print("Glyph at slot " + str( glyph.encoding ) \
-+					+ " is Private Use but has Unicode")
- 				problem = True
- 		else:
- 			if glyph.encoding != glyph.unicode:
-				print "Glyph at slot " + str( glyph.encoding ) \
-					+ " has wrong Unicode"
-+				print("Glyph at slot " + str( glyph.encoding ) \
-+					+ " has wrong Unicode")
- 				problem = True
- 
- # --------------------------------------------------------------------------
-diff -up ./doc/fonts/gnu-freefont/tools/test/findBackLayers.py.py3 ./doc/fonts/gnu-freefont/tools/test/findBackLayers.py
--- ./doc/fonts/gnu-freefont/tools/test/findBackLayers.py.py3	2019-08-18 08:43:27.206544016 -0400
-+++ ./doc/fonts/gnu-freefont/tools/test/findBackLayers.py	2019-08-18 08:44:00.456743596 -0400
-@@ -32,7 +32,7 @@ from sys import exit
- problem = False
- 
- def checkBackLayers( fontPath ):
-	print "Checking " + fontPath
-+	print("Checking " + fontPath)
- 	font = fontforge.open( fontPath )
- 
- 	g = font.selection.all()
-@@ -42,7 +42,7 @@ def checkBackLayers( fontPath ):
- 
- 	for e in g:
- 		if e.layer_cnt != 2:
-			print e
-+			print(e)
- 
- checkBackLayers( '../sfd/FreeSerif.sfd' )
- checkBackLayers( '../sfd/FreeSerifItalic.sfd' )
-diff -up ./doc/fonts/gnu-freefont/tools/test/isMonoMono.py.py3 ./doc/fonts/gnu-freefont/tools/test/isMonoMono.py
--- ./doc/fonts/gnu-freefont/tools/test/isMonoMono.py.py3	2019-08-18 08:44:12.128462618 -0400
-+++ ./doc/fonts/gnu-freefont/tools/test/isMonoMono.py	2019-08-18 08:44:55.105428039 -0400
-@@ -35,7 +35,7 @@ import sys
- problem = False
- 
- def ismonomono( fontfilename ):
-	print "Checking character bounding boxes: " + fontfilename
-+	print("Checking character bounding boxes: " + fontfilename)
- 	font = fontforge.open( fontfilename )
- 
- 	g = font.selection.all()
-@@ -49,16 +49,16 @@ def ismonomono( fontfilename ):
- 				nonzero = e.width
- 		else:
- 			if e.width > 0 and e.width != nonzero:
-				print '  ' + e.glyphname \
-+				print('  ' + e.glyphname \
- 					+ '(' + str( e.encoding ) \
- 					+ ') width is ' + str( e.width ) \
-					+ ' not ' + str( nonzero )
-+					+ ' not ' + str( nonzero ))
- 				problem = True
- 
- 		( xmin, ymin, xmax, ymax ) = e.boundingBox()
- 		if ymin < -200 or ymax > 800:
-			print '  ' + e.glyphname + ' goes between heights ' \
-				+ str( ymin )  + ' and ' + str( ymax )
-+			print('  ' + e.glyphname + ' goes between heights ' \
-+				+ str( ymin )  + ' and ' + str( ymax ))
- 	""" 
- 	For FontForge handling of TrueType/OpenType magic characters:
- 	1) check that 0x0000 0x0001, 0x000D exist and have names
-@@ -71,15 +71,15 @@ def ismonomono( fontfilename ):
- 	if not font[0x0000] \
- 		or font[0x0000].glyphname != '.notdef' \
- 		or font[0x0000].width != nonzero:
-		print 'Should be full-width ".notdef" glyph at 0x0000.'
-+		print('Should be full-width ".notdef" glyph at 0x0000.')
- 	if not font[0x0001] \
- 		or font[0x0001].glyphname != '.null' \
- 		or font[0x0001].width != 0:
-		print 'Should be zero-width ".null" glyph at 0x0001.'
-+		print('Should be zero-width ".null" glyph at 0x0001.')
- 	if not font[0x000D] \
- 		or font[0x000D].glyphname != 'nonmarkingreturn' \
- 		or font[0x000D].width != nonzero:
-		print 'Should be full-width "nonmarkingreturn" glyph at 0x000D.'
-+		print('Should be full-width "nonmarkingreturn" glyph at 0x000D.')
- 
- scriptname = sys.argv[0];
- argc = len( sys.argv )
-diff -up ./doc/fonts/gnu-freefont/tools/test/validate.py.py3 ./doc/fonts/gnu-freefont/tools/test/validate.py
--- ./doc/fonts/gnu-freefont/tools/test/validate.py.py3	2019-08-18 08:45:06.988141993 -0400
-+++ ./doc/fonts/gnu-freefont/tools/test/validate.py	2019-08-18 08:45:57.561924523 -0400
-@@ -43,7 +43,7 @@ def countPointsInLayer( layer ):
- 	return p
- 
- def printProblemLine( e, msg ):
-	print "\t" + e.glyphname + msg 
-+	print("\t" + e.glyphname + msg) 
- 
- def dealWithValidationState( state, e ):
- 	if state & 0x2:
-@@ -81,13 +81,13 @@ def dealWithValidationState( state, e ):
- 	if state & 0x10000:
- 		printProblemLine( e, " has references deeper than allowed" )
- 	if state & 0x20000:
-		print e.glyphname + " fpgm or prep tables longer than allowed" )
-+		print(e.glyphname + " fpgm or prep tables longer than allowed" ))
- 	"""
- 
- def validate( dir, fontFile ):
- 	try:
- 		font = fontforge.open( dir + fontFile )
-		print "Validating " + fontFile
-+		print("Validating " + fontFile)
- 
- 		g = font.selection.all()
- 		g = font.selection.byGlyphs
-@@ -98,9 +98,9 @@ def validate( dir, fontFile ):
- 			if state != 0:
- 				dealWithValidationState( state, e )
- 		font.validate
-	except Exception, e:
-+	except Exception as e:
- 		problem = True
-		print >> sys.stderr, str( e )
-+		print(str( e ), file=sys.stderr)
- 
- validate( '../sfd/', 'FreeSerif.sfd' )
- validate( '../sfd/', 'FreeSerifItalic.sfd' )
-diff -up ./doc/fonts/gnu-freefont/tools/utility/hex_range.py.py3 ./doc/fonts/gnu-freefont/tools/utility/hex_range.py
--- ./doc/fonts/gnu-freefont/tools/utility/hex_range.py.py3	2019-08-18 08:46:09.302641885 -0400
-+++ ./doc/fonts/gnu-freefont/tools/utility/hex_range.py	2019-08-18 08:46:58.356461003 -0400
-@@ -40,13 +40,13 @@ postfix = ';'
- 
- def explain_error_and_quit( e ):
- 	if e:
-		print 'Error: ', e
-	print "Usage:"
-	print "       hex_range num1 [num2]"
-+		print('Error: ', e)
-+	print("Usage:")
-+	print("       hex_range num1 [num2]")
- 	exit( 1 )
- 
- def print_formatted_hex_value( n ):
-	print '%s%0.4x%s' %( prefix, n, postfix )
-+	print('%s%0.4x%s' %( prefix, n, postfix ))
- 
- if len( sys.argv ) == 3:
- 	try:
-@@ -54,13 +54,13 @@ if len( sys.argv ) == 3:
- 		b = int( sys.argv[2], 0 )
- 		for i in xrange( a, b + 1 ):
- 			print_formatted_hex_value( i )
-	except ValueError, e:
-+	except ValueError as e:
- 		explain_error_and_quit( e )
- elif len( sys.argv ) == 2:
- 	try:
- 		a = int( sys.argv[1], 0 )
- 		print_formatted_hex_value( a )
-	except ValueError, e:
-+	except ValueError as e:
- 		explain_error_and_quit( e )
- else:
- 		explain_error_and_quit()
-diff -up ./doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py.py3 ./doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py
--- ./doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py.py3	2019-08-18 08:47:10.751162633 -0400
-+++ ./doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py	2019-08-18 08:47:43.083384292 -0400
-@@ -35,11 +35,11 @@ import fnmatch, re
- problem = False
- 
- def import_glyph( font, name, chrnum ):
-	print "importing file: " + name + " to slot " + str( chrnum )
-+	print("importing file: " + name + " to slot " + str( chrnum ))
- 
- 	g = font.createChar( chrnum )
- 
-	print "importing outlines " + name 
-+	print("importing outlines " + name)
- 	g.importOutlines( name )
- 	# The glyphs produced by MetaPost usually have a grid, whose
- 	# right side seems to correspond to the proper right side bearing
-@@ -56,7 +56,7 @@ re_file_pat = re.compile( file_pat )
- if argc > 2:
- 	fontfilename = sys.argv[1]
- 	font = fontforge.open( fontfilename )
-	print "bulk importing to font file: " + fontfilename
-+	print("bulk importing to font file: " + fontfilename)
- 	chrnum = 0
- 	directories = os.listdir('.')
- 	directories.sort()
-diff -up ./doc/fonts/gnu-freefont/tools/utility/special-purpose/makeBraille.py.py3 ./doc/fonts/gnu-freefont/tools/utility/special-purpose/makeBraille.py
--- ./doc/fonts/gnu-freefont/tools/utility/special-purpose/makeBraille.py.py3	2019-08-18 08:49:05.631397114 -0400
-+++ ./doc/fonts/gnu-freefont/tools/utility/special-purpose/makeBraille.py	2019-08-18 08:49:34.269707707 -0400
-@@ -60,12 +60,12 @@ def createAndName( font, off ):
- 	return font.createChar( 0x2800 + off, 'braille%0.2X' % off )
- 
- def drawtopsix( g, off ):
-	print 'created', 'braille%0.2X' % off
-+	print('created', 'braille%0.2X' % off)
- 	g.clear()
- 	g.right_side_bearing = glyphwidth
- 	for col in range ( 0, 2 ):
- 		for row in range ( 0, 3 ):
-			print 'shift', ( 3 * col + row )
-+			print('shift', ( 3 * col + row ))
- 			state = ( 1 << ( 3 * col + row ) ) & off
- 			drawdot( g, col, row, state )
- 
-diff -up ./doc/generic/enctex/unimap.py.py3 ./doc/generic/enctex/unimap.py
--- ./doc/generic/enctex/unimap.py.py3	2019-08-18 08:52:49.201015107 -0400
-+++ ./doc/generic/enctex/unimap.py	2019-08-18 08:54:08.301110903 -0400
-@@ -91,12 +91,12 @@ def linetype(line):
-         return LineType.Character, (int(line[:m.end()], 16),
-                                     line[m.end():].strip().lower())
-     if not line.startswith('\t'):
-        raise ValueError, 'Queer line doesn\'t start with @ or Tab'
-+        raise ValueError('Queer line doesn\'t start with @ or Tab')
-     line = line.strip()
-     if not line:
-         return LineType.Empty, None
-     if not LineType.map.has_key(line[0]):
-        raise ValueError, 'Queer character info line (marker %s)' % line[0]
-+        raise ValueError('Queer character info line (marker %s)' % line[0])
-     return line[0], line[1:].strip()
- 
- def utf8chars(u):
-@@ -132,7 +132,7 @@ while typ:
-         char = val
-     elif typ == LineType.TeX:
-         if not val.startswith('\\'):
-            raise ValueError, '%s is not a control seq (U%X)' % (val, char[0])
-+            raise ValueError('%s is not a control seq (U%X)' % (val, char[0]))
-         if sect:
-             fw.write('\n%% %s\n' % sect)
-             sect = None
--- a/SOURCES/texlive-2022-luatex-CVE-2023-32700.patch
+++ b/SOURCES/texlive-2022-luatex-CVE-2023-32700.patch
--- a/SOURCES/texlive-2024-fedora-texmfcnf.lua.patch
+++ b/SOURCES/texlive-2024-fedora-texmfcnf.lua.patch
@ -1,63 +0,0 @@
-diff -up web2c/texmfcnf.lua.orig web2c/texmfcnf.lua
--- ./web2c/texmfcnf.lua.orig	2024-03-30 11:39:30.000000000 -0400
-+++ ./web2c/texmfcnf.lua	2024-05-02 23:15:08.737490409 -0400
-@@ -11,6 +11,7 @@ return {
-     comment = "ConTeXt MkIV and LMTX configuration file",
-     author  = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-     target  = "texlive",
-+    -- modified for Fedora, based on Preining Norbert's work in Debian
- 
-     content = {
- 
-@@ -52,7 +53,7 @@ return {
- 
-             TEXMFVAR        = "home:" .. hiddentexlivepath .. "/texmf-var",
-             TEXMFCONFIG     = "home:" .. hiddentexlivepath .. "/texmf-config",
-            TEXMFSYSVAR     = "selfautoparent:texmf-var",
-+            TEXMFSYSVAR     = "/var/lib/texmf",
-             TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
- 
-             -- I don't like this texmf under home and texmf-home would make more sense. One never knows
-@@ -62,7 +63,7 @@ return {
-             -- By using prefixes we don't get expanded paths in the cache __path__ entry. This makes the
-             -- tex root relocatable.
- 
-            TEXMFOS         = "selfautodir:",
-+            -- TEXMFOS         = "selfautodir:",
- 
-             -- standalone:
- 
-@@ -73,8 +74,9 @@ return {
- 
-             -- texlive:
- 
-            TEXMFDIST       = "selfautoparent:texmf-dist",
-            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
-+            TEXMFDIST       = "/usr/share/texlive/texmf-dist",
-+            TEXMFFEDORA     = "/usr/share/texmf",
-+            TEXMFSYSCONFIG  = "/usr/share/texlive/texmf-config",
- 
-             -- The texmf-local path is only used for (maybe) some additional configuration file.
- 	    -- Changed texmf-local to use ../ per Bruno Voisin,
-@@ -86,9 +88,9 @@ return {
- 	    -- More info:
- 	    --   https://wiki.contextgarden.net/Use_the_fonts_you_want
- 	    --   https://wiki.contextgarden.net/Mtxrun#base and #fontsa
-            TEXMFLOCAL      = "selfautoparent:../texmf-local",
-            TEXMFFONTS      = "selfautoparent:texmf-fonts",
-            TEXMFPROJECT    = "selfautoparent:texmf-project",
-+            TEXMFLOCAL      = "/usr/share/texlive/texmf-local",
-+         -- TEXMFFONTS      = "selfautoparent:texmf-fonts",
-+         -- TEXMFPROJECT    = "selfautoparent:texmf-project",
- 
-             TEXMFHOME       = "home:texmf",
-          -- TEXMFHOME       = os.name == "macosx" and "home:Library/texmf" or "home:texmf",
-@@ -102,7 +104,7 @@ return {
- 
-             -- texlive:
- 
-            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
-+            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFFEDORA,!!$TEXMFDIST}",
- 
-             TEXFONTMAPS     = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
-             ENCFONTS        = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",
--- a/SOURCES/texlive-20240311-tex4ht.patch
+++ b/SOURCES/texlive-20240311-tex4ht.patch
@ -1,48 +0,0 @@
-diff -up texlive-20240311/source/texk/tex4htk/java/xtpipes/InputObject.java.me texlive-20240311/source/texk/tex4htk/java/xtpipes/InputObject.java
-diff -up texlive-20240311/source/texk/tex4htk/java/xtpipes/util/ScriptsManager.java.me texlive-20240311/source/texk/tex4htk/java/xtpipes/util/ScriptsManager.java
--- texlive-20240311/source/texk/tex4htk/java/xtpipes/util/ScriptsManager.java.me	2024-08-08 17:31:10.121875390 +0200
-+++ texlive-20240311/source/texk/tex4htk/java/xtpipes/util/ScriptsManager.java	2024-08-08 17:32:03.258933555 +0200
-@@ -37,7 +37,7 @@ Stack<Integer> nsStack = new Stack<Integ
-    public void startElement(String ns, String sName,
-                         String qName, Attributes atts) {
-    int top = nsName.size();
-nsStack.push( new Integer(top) );
-+nsStack.push( top );
- 
-    String key = (atts==null)?
-                null
-@@ -87,11 +87,11 @@ for(int i=top; i>0; ){
-  }
-    s += ">" ;
-    if( flag ){
-   Object [] state = { new Boolean(savemode), code, match };
-+   Object [] state = { savemode, code, match };
-    stack.push( state );
-    savemode=true; code=""; match= key;
- } else {
-   Object [] state = { new Boolean(savemode), null, null };
-+   Object [] state = { savemode, null, null };
-    stack.push( state );
- }
- add( s );
-diff -up texlive-20240311/source/texk/tex4htk/java/xtpipes/Xtpipes.java.me texlive-20240311/source/texk/tex4htk/java/xtpipes/Xtpipes.java
--- texlive-20240311/source/texk/tex4htk/java/xtpipes/Xtpipes.java.me	2024-08-08 17:29:42.138123299 +0200
-+++ texlive-20240311/source/texk/tex4htk/java/xtpipes/Xtpipes.java	2024-08-08 17:31:06.075794819 +0200
-@@ -517,7 +517,7 @@ if( saxReaderStack.empty() ){
-       saxReader.setContentHandler( new DefaultHandler(){
-          private Stack <Boolean> condition = new Stack <Boolean> ();
- public void startDocument () {
-   condition.push( new Boolean(true) );
-+   condition.push( true );
- }
- public void startElement(String ns, String sName,
-                         String qName, Attributes atts) {
-@@ -616,7 +616,7 @@ if( name.equals("content-type") ){
-         condition = null;
-         return;
-    }  }
-   condition.push( new Boolean(cond) );
-+   condition.push( cond );
- }
- public void endElement(String ns, String sName, String qName) {
-    if( condition == null ){ return; }
--- a/SOURCES/texlive-20240311-texinfo-path-fix.patch
+++ b/SOURCES/texlive-20240311-texinfo-path-fix.patch
@ -1,44 +0,0 @@
-diff -up texlive-20240311/source/texk/kpathsea/texmf.cnf.texinfo-fix texlive-20240311/source/texk/kpathsea/texmf.cnf
--- texlive-20240311/source/texk/kpathsea/texmf.cnf.texinfo-fix	2024-12-08 12:52:06.638563497 +0100
-+++ texlive-20240311/source/texk/kpathsea/texmf.cnf	2024-12-08 13:40:14.565417658 +0100
-@@ -59,7 +59,7 @@
- % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
- % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
- % Sorry for the off-by-one-generation names.
-TEXMFROOT = $SELFAUTOPARENT
-+TEXMFROOT = /usr/share/texlive
- 
- % The various texmf trees used by TeX Live, follow.
- % They must must all have the TDS directory structure (https://tug.org/tds).
-@@ -72,10 +72,10 @@ TEXMFDIST = $TEXMFROOT/texmf-dist
- TEXMFMAIN = $TEXMFDIST
- 
- % Local additions to the distribution trees.
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
-+TEXMFLOCAL = /usr/share/texlive/texmf-local
- 
- % TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = $TEXMFROOT/texmf-var
-+TEXMFSYSVAR = /var/lib/texmf
- 
- % TEXMFSYSCONFIG, where *-sys store configuration data.
- TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
-@@ -86,6 +86,9 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
- % to %USERPROFILE% on Windows, $HOME otherwise.
- TEXMFHOME = ~/texmf
- 
-+% Texinfo on Fedora lives out of $TEXMFROOT
-+TEXINFOHOME = /usr/share/texmf
-+
- % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
- TEXMFVAR = ~/.texlive2024/texmf-var
- 
-@@ -111,7 +114,7 @@ TEXMFAUXTREES = {}
- % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree
- % is defined (99% common case), no extra elements will be added to
- % the search paths. tlmgr takes care to end any value with a trailing comma.
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
-+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXINFOHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
- 
- % Where to look for, and where mktexlsr creates, ls-R files. By default,
- % this is all and only the !! elements of TEXMF, so that mktexlsr does not
--- a/SOURCES/texlive-base-20180414-disable-omegafonts-check-test.patch
+++ b/SOURCES/texlive-base-20180414-disable-omegafonts-check-test.patch
@ -0,0 +1,12 @@
+diff -up texlive-base-20180414/source/texk/web2c/omegafonts/check.test.disabletest texlive-base-20180414/source/texk/web2c/omegafonts/check.test
+--- texlive-base-20180414/source/texk/web2c/omegafonts/check.test.disabletest	2018-10-04 13:24:17.965126655 -0400
+++ texlive-base-20180414/source/texk/web2c/omegafonts/check.test	2018-10-04 13:24:26.068945230 -0400
+@@ -4,6 +4,8 @@
+ # Copyright 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
+ # You may freely use, modify and/or distribute this file.
+ 
+exit 0
+
+ test -d tests || mkdir -p tests
+ 
+ TEXMFCNF=$srcdir/../../kpathsea
--- a/SOURCES/texlive-base-20180414-synctex-do-not-throw-no-file-error.patch
+++ b/SOURCES/texlive-base-20180414-synctex-do-not-throw-no-file-error.patch
@ -0,0 +1,11 @@
+diff -up texlive-base-20180414/source/texk/web2c/synctexdir/synctex_parser.c.shh texlive-base-20180414/source/texk/web2c/synctexdir/synctex_parser.c
+--- texlive-base-20180414/source/texk/web2c/synctexdir/synctex_parser.c.shh	2019-03-19 11:02:44.303218932 -0400
+++ texlive-base-20180414/source/texk/web2c/synctexdir/synctex_parser.c	2019-03-19 11:02:59.545857443 -0400
+@@ -6023,7 +6023,6 @@ synctex_scanner_p synctex_scanner_new_wi
+     if ((scanner->reader = synctex_reader_init_with_output_file(scanner->reader, output, build_directory))) {
+         return parse? synctex_scanner_parse(scanner):scanner;
+     }
+-    _synctex_error("No file?");
+     return NULL;
+ }
+ 
--- a/SOURCES/texlive-base-20190410-CVE-2019-19601.patch
+++ b/SOURCES/texlive-base-20190410-CVE-2019-19601.patch
@ -0,0 +1,16 @@
+diff -up texlive-base-20190410/source/texk/detex/detex-src/detex.l.me texlive-base-20190410/source/texk/detex/detex-src/detex.l
+--- texlive-base-20190410/source/texk/detex/detex-src/detex.l.me	2020-02-05 12:54:36.100840384 +0100
+++ texlive-base-20190410/source/texk/detex/detex-src/detex.l	2020-02-05 13:00:28.476320773 +0100
+@@ -898,10 +898,10 @@ TexOpen(char *sbFile)
+ #else
+ 	    if (*sbFile == '/') {	/* absolute path */
+ #endif
+-		(void)sprintf(sbFullPath, "%s", sbFile);
+		(void)snprintf(sbFullPath, PATH_MAX-1, "%s", sbFile);
+ 		iPath = csbInputPaths;	/* only check once */
+ 	    } else
+-		(void)sprintf(sbFullPath, "%s/%s", rgsbInputPaths[iPath], sbFile);
+		(void)snprintf(sbFullPath, PATH_MAX-1, "%s/%s", rgsbInputPaths[iPath], sbFile);
+ #ifdef OS2
+ 	    pch = sbFullPath;
+ 	    while (pch = strchr(pch, '\\'))
--- a/SOURCES/texlive-base-20220321-out-of-memory.patch
+++ b/SOURCES/texlive-base-20220321-out-of-memory.patch
@ -1,12 +0,0 @@
-diff -up texlive-base-20220321/source/texk/kpathsea/texmf.cnf.out_of_memory texlive-base-20220321/source/texk/kpathsea/texmf.cnf
--- texlive-base-20220321/source/texk/kpathsea/texmf.cnf.out_of_memory	2022-04-24 15:50:46.472711270 -0400
-+++ texlive-base-20220321/source/texk/kpathsea/texmf.cnf	2022-04-24 15:51:47.213026575 -0400
-@@ -789,7 +789,7 @@ texmf_casefold_search = 1
- % To increase space for boxes (as might be needed by, e.g., PiCTeX),
- % increase extra_mem_bot.
- %
-main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
-+main_memory = 6000000 % words of inimemory available; also applies to inimf&mp
- extra_mem_top = 0     % extra high memory for chars, tokens, etc.
- extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
- 
--- a/SOURCES/texlive-base-20220321-pdf-header-order-fix.patch
+++ b/SOURCES/texlive-base-20220321-pdf-header-order-fix.patch
@ -1,47 +0,0 @@
-diff -up texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc.header-order-fix texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc
--- texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc.header-order-fix	2023-01-31 12:53:39.214112015 -0500
-+++ texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc	2023-01-31 12:54:07.175413160 -0500
-@@ -17,6 +17,11 @@ You should have received a copy of the G
- with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-+/*
-+Load aconf.h first to ensure _FILE_OFFSET_BITS is factored in.
-+*/
-+#include <aconf.h>
-+
- /* 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'.
-@@ -31,7 +36,6 @@ with this program.  If not, see <http://
- #include <string.h>
- #include <ctype.h>
- 
-#include <aconf.h>
- #include <GString.h>
- #include <gmem.h>
- #include <gfile.h>
-diff -up texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc.header-order-fix texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc
--- texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc.header-order-fix	2023-01-31 12:41:21.483166562 -0500
-+++ texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc	2023-01-31 12:53:15.185853229 -0500
-@@ -16,6 +16,12 @@ GNU General Public License for more deta
- You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-+
-+/* 
-+Load aconf.h first to ensure _FILE_OFFSET_BITS is factored in.
-+*/
-+#include <aconf.h>
-+
- #include <w2c/config.h>
- 
- #include <stdlib.h>
-@@ -24,7 +30,6 @@ with this program.  If not, see <http://
- #include <string.h>
- #include <ctype.h>
- 
-#include <aconf.h>
- #include <GString.h>
- #include <gmem.h>
- #include <gfile.h>
--- a/SOURCES/texlive-base-20220321-xpdf-no-GfxFont-decRefCnt.patch
+++ b/SOURCES/texlive-base-20220321-xpdf-no-GfxFont-decRefCnt.patch
@ -1,12 +0,0 @@
-diff -up texlive-base-20220321/source/configure.poppler-22.08.0 texlive-base-20220321/source/configure
--- texlive-base-20220321/source/configure.poppler-22.08.0	2022-10-31 09:48:21.875540925 -0400
-+++ texlive-base-20220321/source/configure	2022-10-31 09:50:13.731220862 -0400
-@@ -23545,7 +23545,7 @@ printf %s "checking requested system \`x
- int
- main (void)
- {
-GfxFont *gfxFont; gfxFont->decRefCnt();
-+GfxFont *gfxFont; gfxFont->getFlags();
-   ;
-   return 0;
- }
--- a/SOURCES/texlive-base-20230311-fix-scripts.patch
+++ b/SOURCES/texlive-base-20230311-fix-scripts.patch
@ -1,20 +0,0 @@
-diff -up ./scripts/context/perl/mptopdf.pl.fix-scripts ./scripts/context/perl/mptopdf.pl
--- ./scripts/context/perl/mptopdf.pl.fix-scripts	2023-05-25 11:52:19.149713294 -0400
-+++ ./scripts/context/perl/mptopdf.pl	2023-05-25 11:53:05.379317240 -0400
-@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-        if 0;
-+#! /usr/bin/perl -w
- 
- # MikTeX users can set environment variable TEXSYSTEM to "miktex".
- 
-diff -up ./scripts/thumbpdf/thumbpdf.pl.fix-scripts ./scripts/thumbpdf/thumbpdf.pl
--- ./scripts/thumbpdf/thumbpdf.pl.fix-scripts	2023-05-25 11:53:23.018547680 -0400
-+++ ./scripts/thumbpdf/thumbpdf.pl	2023-05-25 11:53:44.086822918 -0400
-@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-+#! /usr/bin/perl -w
- use strict;
- $^W=1; # turn warning on
- #
--- a/SOURCES/texlive-base-20230311-typecasts.patch
+++ b/SOURCES/texlive-base-20230311-typecasts.patch
@ -1,12 +0,0 @@
-diff -up texlive-base-20230311/source/texk/xdvik/gui/pagesel.c.me texlive-base-20230311/source/texk/xdvik/gui/pagesel.c
--- texlive-base-20230311/source/texk/xdvik/gui/pagesel.c.me	2024-01-19 21:02:08.541378286 +0100
-+++ texlive-base-20230311/source/texk/xdvik/gui/pagesel.c	2024-01-19 21:17:31.425443142 +0100
-@@ -538,7 +538,7 @@ xaw_update_list(void)
-     button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width);
-     /* delete and re-create list */
-     ASSERT(total_pages <= (int)page_info.index_size, "");
-    XawListChange(LIST_WIDGET, page_info.page_labels, 0,
-+    XawListChange(LIST_WIDGET,(const char **) page_info.page_labels, 0,
- 		  MAX(button_width, pagelist_width), False);
-     /* restore selected item */
-     if (idx != XAW_LIST_NONE) {
--- a/SOURCES/texlive-base-20230311-typefixes.patch
+++ b/SOURCES/texlive-base-20230311-typefixes.patch
@ -1,20 +0,0 @@
--- texlive-base-20230311/source/texk/web2c/pdftexdir/pdftex.ch.orig	2023-05-02 17:26:43.000000000 +0200
-+++ texlive-base-20230311/source/texk/web2c/pdftexdir/pdftex.ch	2024-01-20 21:59:58.382906926 +0100
-@@ -179,7 +179,7 @@ pdf_font_type:=xmalloc_array(eight_bits,
- pdf_font_attr:=xmalloc_array(str_number, font_max);
- pdf_font_blink:=xmalloc_array(internal_font_number, font_max);
- pdf_font_elink:=xmalloc_array(internal_font_number, font_max);
-pdf_font_has_space_char:=xmalloc_array(internal_font_number, font_max);
-+pdf_font_has_space_char:=xmalloc_array(boolean, font_max);
- pdf_font_stretch:=xmalloc_array(integer, font_max);
- pdf_font_shrink:=xmalloc_array(integer, font_max);
- pdf_font_step:=xmalloc_array(integer, font_max);
-@@ -298,7 +298,7 @@ pdf_font_type:=xmalloc_array(eight_bits,
- pdf_font_attr:=xmalloc_array(str_number,font_max);
- pdf_font_blink:=xmalloc_array(internal_font_number,font_max);
- pdf_font_elink:=xmalloc_array(internal_font_number,font_max);
-pdf_font_has_space_char:=xmalloc_array(internal_font_number,font_max);
-+pdf_font_has_space_char:=xmalloc_array(boolean,font_max);
- pdf_font_stretch:=xmalloc_array(integer,font_max);
- pdf_font_shrink:=xmalloc_array(integer,font_max);
- pdf_font_step:=xmalloc_array(integer,font_max);
--- a/SOURCES/texlive-base-libpaperv2.patch
+++ b/SOURCES/texlive-base-libpaperv2.patch
@ -1,102 +0,0 @@
-diff -up texlive-base-20220321/source/texk/psutils/tests/playres.ps.libpaper2 texlive-base-20220321/source/texk/psutils/tests/playres.ps
--- texlive-base-20220321/source/texk/psutils/tests/playres.ps.libpaper2	2023-01-08 23:22:46.519324804 -0500
-+++ texlive-base-20220321/source/texk/psutils/tests/playres.ps	2023-01-08 23:22:56.824405896 -0500
-@@ -280,7 +280,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 15 4 bop 330 423 a Fb(5)2834 b(5)1622 3275
-@@ -293,7 +293,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 16 5 bop 330 419 a Fb(6)2834 b(6)1622 3264
-@@ -306,7 +306,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 17 6 bop 330 419 a Fb(7)2834 b(7)1622 3266
-@@ -319,7 +319,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 18 7 bop 330 419 a Fb(8)2834 b(8)1622 3264
-@@ -332,7 +332,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 19 8 bop 330 419 a Fb(9)2834 b(9)1622 3261
-@@ -345,7 +345,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 20 9 bop 330 419 a Fb(10)2668 b(10)1415
-@@ -358,7 +358,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 21 10 bop 330 419 a Fb(11)2668 b(11)1415
-@@ -371,7 +371,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 22 11 bop 330 419 a Fb(12)2668 b(12)1415
-@@ -384,7 +384,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 23 12 bop 330 419 a Fb(13)2668 b(13)1415
-@@ -397,7 +397,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 24 13 bop 330 419 a Fb(14)2668 b(14)1415
-@@ -410,7 +410,7 @@ PStoPSmatrix setmatrix
- 0.704762 dup scale
- userdict/PStoPSmatrix matrix currentmatrix put
- userdict/PStoPSclip{0 0 moveto
- 595.275591 0 rlineto 0 844.647799 rlineto -595.275591 0 rlineto
-+ 595.275591 0 rlineto 0 844.647797 rlineto -595.275591 0 rlineto
-  closepath}put initclip
- PStoPSxform concat
- TeXDict begin 25 14 bop 330 423 a Fb(15)2668 b(15)1415
--- a/SPECS/texlive.spec
+++ b/SPECS/texlive.spec