diff options
author | Ismael Luceno | 2021-09-26 12:41:05 +0200 |
---|---|---|
committer | Ismael Luceno | 2021-09-26 12:42:02 +0200 |
commit | 1b55d4182c6d1f339c9e4e95baa1030d1cb591ba (patch) | |
tree | 15de7573d2fb7b0e6939695c7b7a157ddad8617f /latex | |
parent | 8dc552a9a77290a62fab0cb3a12eac1cf119bffc (diff) |
texlive 20210325
Diffstat (limited to 'latex')
-rwxr-xr-x | latex/texlive/BUILD | 7 | ||||
-rwxr-xr-x | latex/texlive/DEPENDS | 4 | ||||
-rwxr-xr-x | latex/texlive/DETAILS | 4 | ||||
-rw-r--r-- | latex/texlive/HISTORY | 13 | ||||
-rwxr-xr-x | latex/texlive/PRE_BUILD | 44 | ||||
-rw-r--r-- | latex/texlive/patches/0001-upmendex-ICU-fix.patch | 25 | ||||
-rw-r--r-- | latex/texlive/patches/0002-kpathsea-Fix-system-paths-in-texmf.cnf.patch | 40 | ||||
-rw-r--r-- | latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch | 33 |
8 files changed, 82 insertions, 88 deletions
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD index 85346821b1..7717170feb 100755 --- a/latex/texlive/BUILD +++ b/latex/texlive/BUILD @@ -1,10 +1,3 @@ -if ! is_version_less $(installed_version binutils) 2.35; then - LDFLAGS+=" -Wl,--allow-multiple-definition" -fi && - -# Flags to allow building against lua 5.3 -#CFLAGS+=" -DLUA_COMPAT_APIINTCASTS" - # LuaTeX needs this CXXFLAGS+=" -fpermissive" && diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS index 25f7a2412b..b918776da7 100755 --- a/latex/texlive/DEPENDS +++ b/latex/texlive/DEPENDS @@ -1,6 +1,6 @@ with_system() { depends "$1" --with-system-"$1" && - if [ "$2" ]; then + if [ -n "$2" ]; then sub_depends "$1" "$2" fi } @@ -9,8 +9,6 @@ with_system gmp && with_system cairo && with_system mpfr && with_system libpaper && -with_system poppler XPDF_HEADERS && -with_system xpdf && with_system graphite2 && with_system harfbuzz GRAPHITE2 && with_system icu && diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS index 905ab228f2..15a23fe305 100755 --- a/latex/texlive/DETAILS +++ b/latex/texlive/DETAILS @@ -1,6 +1,6 @@ SPELL=texlive - VERSION=20200406 - SOURCE_HASH=sha512:65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 + VERSION=20210325 + SOURCE_HASH=sha512:afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 SOURCE="${SPELL}-${VERSION}-source.tar.xz" SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:8}-source" diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY index 3053efc4b0..2448f7980c 100644 --- a/latex/texlive/HISTORY +++ b/latex/texlive/HISTORY @@ -1,3 +1,16 @@ +2021-09-26 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 20210325 + * BUILD: removed -fcommon and -DLUA_COMPAT_APIINTCASTS + * DEPENDS: removed xpdf (wrong), and poppler (unsupported by upstream) + * PRE_BUILD, patches/0001-upmendex-ICU-fix.patch, + patches/0002-kpathsea-Fix-system-paths-in-texmf.cnf.patch: + dropped poppler patching, no longer needed + dropped dvisvgm patching, no longer needed + moved texmf.cnf and upmendex fixing to patch files + removed unbundling of libxpdf + * patches/texlive-20180414-source-upstream_fixes-1.patch: + removed, no longer needed + 2021-04-23 Ismael Luceno <ismael@iodev.co.uk> * FINAL, INSTALL: moved fontconfig cache update to FINAL diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD index 224b3b15e9..3433d755c0 100755 --- a/latex/texlive/PRE_BUILD +++ b/latex/texlive/PRE_BUILD @@ -3,9 +3,6 @@ cd "$SOURCE_DIRECTORY" && apply_patch_dir patches && -# Fix linking of dvisvgm; configure is broken -sedit 's/@LIBGS_LIBS@/-lgs/' texk/dvisvgm/dvisvgm-src/src/Makefile.in && - # removing as much internal things as possible #asymptote \ #devnag \ @@ -39,9 +36,7 @@ for i in \ libpng \ mpfr \ pixman \ - poppler \ potrace \ - xpdf \ zlib \ zziplib do @@ -60,41 +55,4 @@ find \( -name Makefile\* -o -name configure \) \ -o \( -name \*.info -o -name \*.texi \) \ -exec sed -i -e "s:/usr/local:/usr:" {} + && -# Patch paths in texmf.cnf -sedit ' - s@^TEXMFROOT =.*@&/usr/share@ - /^TEXMFLOCAL =/ s@=.*@= $SELFAUTODIR/local/share/texmf@ - /^TEXMFSYSVAR =/ s@=.*@= /var/tmp/texmf-var@ -' texk/kpathsea/texmf.cnf && - -# ICU fix -sed '/utypes.h/i\ -#include <unicode/utf16.h> -' -i texk/upmendex/mendex.h && - -mkdir "$COMPILE_DIRECTORY" && - -if spell_ok poppler; then - cd "${SOURCE_DIRECTORY}/texk/web2c/pdftexdir" && - popplerver="$(installed_version poppler | cut -f 1,2 -d .)" && - case "$popplerver" in - # really old: keep things as-is - (0.?|0.[0-4]?|0.5[0-8]) ;; - # special case for the non-versioned file - (0.59|0.6?|0.70) - ln -vsf pdftosrc{-newpoppler,}.cc - ;& - # symlink the best matches for the installed poppler version - (*) - { - echo ./pdftosrc-poppler$popplerver.z - echo ./pdftoepdf-poppler$popplerver.z - find -name 'pdfto*-poppler*.0.cc' - } | sort -V | awk -F- ' - /z$/ { done[$1]; next } - !($1 in done) { latest[$1] = $0 } - END { for (i in latest) print latest[i], i ".cc" } - ' | xargs -n 2 ln -vsf - esac && - cd "${SOURCE_DIRECTORY}" -fi +mkdir "$COMPILE_DIRECTORY" diff --git a/latex/texlive/patches/0001-upmendex-ICU-fix.patch b/latex/texlive/patches/0001-upmendex-ICU-fix.patch new file mode 100644 index 0000000000..6e0178e5af --- /dev/null +++ b/latex/texlive/patches/0001-upmendex-ICU-fix.patch @@ -0,0 +1,25 @@ +From aeb2a2cb7903fb02bbeaf75e345978deb7fee918 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno <ismael@iodev.co.uk> +Date: Wed, 22 Sep 2021 00:18:12 +0200 +Subject: [PATCH 1/2] upmendex: ICU fix + +Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> +--- + texk/upmendex/mendex.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/texk/upmendex/mendex.h b/texk/upmendex/mendex.h +index d14e5c66753e..65b12055717c 100644 +--- a/texk/upmendex/mendex.h ++++ b/texk/upmendex/mendex.h +@@ -6,6 +6,7 @@ + #include <stdlib.h> + #include <string.h> + ++#include <unicode/utf16.h> + #include <unicode/utypes.h> + #include <unicode/ustring.h> + #include <unicode/uchar.h> +-- +2.33.0 + diff --git a/latex/texlive/patches/0002-kpathsea-Fix-system-paths-in-texmf.cnf.patch b/latex/texlive/patches/0002-kpathsea-Fix-system-paths-in-texmf.cnf.patch new file mode 100644 index 0000000000..e6c835c65a --- /dev/null +++ b/latex/texlive/patches/0002-kpathsea-Fix-system-paths-in-texmf.cnf.patch @@ -0,0 +1,40 @@ +From 0b5a7fdf652ccac260903b93802ef667abcc0406 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno <ismael@iodev.co.uk> +Date: Wed, 22 Sep 2021 00:28:28 +0200 +Subject: [PATCH 2/2] kpathsea: Fix system paths in texmf.cnf + +Upstream-Status: Inappropriate +Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> +--- + texk/kpathsea/texmf.cnf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/texk/kpathsea/texmf.cnf b/texk/kpathsea/texmf.cnf +index c5e33180334e..ee7436d325c3 100644 +--- a/texk/kpathsea/texmf.cnf ++++ b/texk/kpathsea/texmf.cnf +@@ -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 = $SELFAUTODIR/share + + % The main tree of distributed packages and programs: + TEXMFDIST = $TEXMFROOT/texmf-dist +@@ -69,10 +69,10 @@ TEXMFDIST = $TEXMFROOT/texmf-dist + TEXMFMAIN = $TEXMFDIST + + % Local additions to the distribution trees. +-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local ++TEXMFLOCAL = $SELFAUTODIR/local/share/texmf + + % TEXMFSYSVAR, where *-sys store cached runtime data. +-TEXMFSYSVAR = $TEXMFROOT/texmf-var ++TEXMFSYSVAR = /var/tmp/texmf + + % TEXMFSYSCONFIG, where *-sys store configuration data. + TEXMFSYSCONFIG = $TEXMFROOT/texmf-config +-- +2.33.0 + diff --git a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch deleted file mode 100644 index 3521d371a6..0000000000 --- a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ---- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc -+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc -@@ -761,7 +761,7 @@ - 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); -diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc ---- a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc -+++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc -@@ -156,7 +156,6 @@ - (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 +173,7 @@ - // 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(); |