gnu: TeX Live: Update to 2020.0.
* guix/build-system/texlive.scm (%texlive-tag): Set to 2020.0. (%texlive-revision): Set to 54632. * gnu/packages/tex.scm (texlive-extra-src, texlive-texmf-src, texlive-bin, texlive-texmf, texlive): Update to 20200406. (texlive-bin)[source](patches): Remove. [arguments]: Adjust poppler compatibility phase for new upstream patches. * gnu/packages/tex.scm (hyph-utf8-scripts, texlive-docstrip, texlive-unicode-data texlive-hyphen-base, texlive-dvips, texlive-metafont-base, texlive-fontinst, texlive-fontname, texlive-tex-plain, texlive-hyphen-bulgarian, texlive-hyphen-chinese, texlive-hyphen-hungarian, texlive-hyphen-latin, texlive-hyphen-sanskrit, texlive-hyphen-spanish, texlive-hyph-utf8, texlive-kpathsea, texlive-latexconfig, texlive-latex-base, texlive-union, texlive-latex-filecontents, texlive-latex-fancyvrb, texlive-graphics-def, texlive-latex-graphics, texlive-latex-oberdiek, texlive-latex-tools, texlive-latex-l3kernel, texlive-latex-l3packages, texlive-latex-fontspec, texlive-latex-amsmath, texlive-latex-babel, texlive-latex-draftwatermark, texlive-etoolbox, texlive-latex-geometry, texlive-latex-polyglossia, texlive-latex-supertabular, texlive-tex-texinfo, texlive-latex-appendix, texlive-latex-colortbl, texlive-latex-listings, texlive-inconsolata, texlive-latex-enumitem, texlive-latex-multirow, texlive-latex-overpic, texlive-latex-parskip, texlive-latex-pdfpages, texlive-libertine, texlive-latex-titlesec, texlive-metapost, texlive-latex-acmart, texlive-latex-wasysym, texlive-latex-preview, texlive-latex-acronym, texlive-pdftex, texlive-latex-media9, texlive-latex-ocgx2, texlive-latex-ms, texlive-generic-ulem, texlive-latex-pgf, texlive-latex-koma-script, texlive-generic-listofitems, texlive-bibtex, texlive-context-base, texlive-beamer, texlive-pstricks, texlive-marginnote, texlive-iftex, texlive-tools, texlive-siunitx, texlive-booktabs, texlive-csquotes, texlive-biblatex, texlive-microtype, texlive-caption, texlive-ydoc, texlive-courier, texlive-hyperref, texlive-fontspec, texlive-l3build, texlive-luaotfload, texlive-babel, texlive-tipa, texlive-jknappen, texlive-wasy, texlive-context, texlive-cabin, texlive-fourier, texlive-mweights, texlive-newtx, texlive-xcharter, texlive-tcolorbox): Update hashes. (texlive-hyphen-bulgarian): Don't include removed files. (texlive-hyphen-hungarian, texlive-hyphen-sanskrit): Adjust for directory rename. (texlive-hyphen-chinese, texlive-hyphen-latin): Add more files. (texlive-hyphen-macedonian): New public variable. (texlive-metafont-base)[source]: Switch to SVN-MULTI-FETCH. [arguments]: Adjust for extra source files. (texlive-latex-base)[arguments]: Disable more formats. [propagated-inputs]: Add TEXLIVE-HYPHEN-MACEDONIAN. (texlive-fontinst): Don't include "scripts/texlive/fontinst.sh". (texlive-generic-iftex): New public variable. (texlive-iftex, texlive-generic-ifxetex): Deprecate in favor of TEXLIVE-GENERIC-IFTEX. (texlive-latex-oberdiek)[propagated-inputs]: Change from TEXLIVE-GENERIC-IFXETEX to TEXLIVE-GENERIC-IFTEX. (texlive-latex-xkeyval)[native-inputs]: Likewise. (texlive-default-updmap.cfg): Remove variable. * gnu/packages/patches/texlive-bin-poppler-0.83.patch, gnu/packages/patches/texlive-bin-poppler-0.86.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.master
Marius Bakke
parent
683eb7c5b1
commit
7747df1bc2
|
|
@ -1688,8 +1688,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tcsh-fix-autotest.patch \
|
||||
%D%/packages/patches/teensy-loader-cli-help.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-poppler-0.83.patch \
|
||||
%D%/packages/patches/texlive-bin-poppler-0.86.patch \
|
||||
%D%/packages/patches/telegram-purple-adjust-test.patch \
|
||||
%D%/packages/patches/telepathy-glib-channel-memory-leak.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ the in DocBook SGML DTDs.")
|
|||
texlive-fonts-rsfs
|
||||
texlive-fonts-stmaryrd
|
||||
|
||||
texlive-generic-ifxetex)))
|
||||
texlive-generic-iftex)))
|
||||
("imagemagick" ,imagemagick) ;for convert
|
||||
("inkscape" ,inkscape) ;for svg conversion
|
||||
("docbook" ,docbook-xml)
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
Fix build with Poppler 0.83 and later.
|
||||
|
||||
Taken from Arch Linux, but adjusted to patch the versioned Poppler
|
||||
files, as upstream applies it after copying them in place.
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.83.patch?h=packages/texlive-bin
|
||||
|
||||
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
|
||||
--- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
|
||||
+++ texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
|
||||
@@ -723,7 +723,7 @@
|
||||
#endif
|
||||
// initialize
|
||||
if (!isInit) {
|
||||
- globalParams = new GlobalParams();
|
||||
+ globalParams.reset(new GlobalParams());
|
||||
globalParams->setErrQuiet(false);
|
||||
isInit = true;
|
||||
}
|
||||
@@ -1108,6 +1108,5 @@
|
||||
delete_document(p);
|
||||
}
|
||||
// see above for globalParams
|
||||
- delete globalParams;
|
||||
}
|
||||
}
|
||||
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
|
||||
--- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
|
||||
+++ texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
|
||||
@@ -79,7 +79,7 @@
|
||||
exit(1);
|
||||
}
|
||||
fileName = new GString(argv[1]);
|
||||
- globalParams = new GlobalParams();
|
||||
+ globalParams.reset(new GlobalParams());
|
||||
doc = new PDFDoc(fileName);
|
||||
if (!doc->isOk()) {
|
||||
fprintf(stderr, "Invalid PDF file\n");
|
||||
@@ -100,7 +100,7 @@
|
||||
if (objnum == 0) {
|
||||
srcStream = catalogDict.dictLookup("SourceObject");
|
||||
static char const_SourceFile[] = "SourceFile";
|
||||
- if (!srcStream.isStream(const_SourceFile)) {
|
||||
+ if (!srcStream.isDict(const_SourceFile)) {
|
||||
fprintf(stderr, "No SourceObject found\n");
|
||||
exit(1);
|
||||
}
|
||||
@@ -202,5 +202,4 @@
|
||||
fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
|
||||
fclose(outfile);
|
||||
delete doc;
|
||||
- delete globalParams;
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Fix build with Poppler 0.86 and later.
|
||||
|
||||
Taken from Arch Linux, but adjusted to patch the versioned Poppler
|
||||
files, as upstream applies it after copying them in place.
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin
|
||||
|
||||
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:11:35.102711802 +0000
|
||||
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:13:13.057420111 +0000
|
||||
@@ -757,7 +757,7 @@
|
||||
if (page_name) {
|
||||
// get page by name
|
||||
GString name(page_name);
|
||||
- LinkDest *link = pdf_doc->doc->findDest(&name);
|
||||
+ LinkDest *link = pdf_doc->doc->findDest(&name).get();
|
||||
if (link == 0 || !link->isOk())
|
||||
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
|
||||
Ref ref = link->getPageRef();
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -44,8 +44,8 @@
|
|||
|
||||
;; These variables specify the SVN tag and the matching SVN revision. They
|
||||
;; are taken from https://www.tug.org/svn/texlive/tags/
|
||||
(define %texlive-tag "texlive-2019.3")
|
||||
(define %texlive-revision 51265)
|
||||
(define %texlive-tag "texlive-2020.0")
|
||||
(define %texlive-revision 54632)
|
||||
|
||||
(define (texlive-origin name version locations hash)
|
||||
"Return an <origin> object for a TeX Live package consisting of multiple
|
||||
|
|
|
|||
Reference in New Issue