From 04f30c8974a6e662c692644047170be67a8a3ffe Mon Sep 17 00:00:00 2001 From: bill-auger Date: Tue, 21 Jul 2020 05:49:49 -0400 Subject: [libre/texlive-core]: upgrade to v2020.55416 --- libre/texlive-core/PKGBUILD | 145 +++++++++++++++------------------ libre/texlive-core/mktexlsr.hook | 2 +- libre/texlive-core/texlive-core.fmts | 6 +- libre/texlive-core/texlive-updmap.hook | 2 +- 4 files changed, 73 insertions(+), 82 deletions(-) diff --git a/libre/texlive-core/PKGBUILD b/libre/texlive-core/PKGBUILD index d9f8c6e02..04b033025 100644 --- a/libre/texlive-core/PKGBUILD +++ b/libre/texlive-core/PKGBUILD @@ -6,10 +6,10 @@ _pkgname=texlive-core-libre pkgname=texlive-core -pkgver=2019.50917 -_revnr=${pkgver#2019.} +pkgver=2020.55416 +_revnr=${pkgver#2020.} pkgrel=1 -pkgrel+=.par2 +pkgrel+=.par1 pkgdesc="TeX Live core distribution" pkgdesc+=", without nonfree add-on packages (Parabola rebranded)" license=('GPL') @@ -18,7 +18,7 @@ depends=('texlive-bin' 'perl') optdepends=( 'dialog: for texconfig' 'ghostscript: for epstopdf, epspdf and other ConTeXt tools' - 'java-runtime: for utilities like arara' + 'java-runtime: for utilities like arara, texplate' 'perl-tk: for texdoctk' 'psutils: to manipulate the output of dvips' 'python: for pythontex' @@ -29,18 +29,16 @@ optdepends=( groups=('texlive-most') conflicts=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-genericextra' - 'texlive-plainextra' - 'texlive-core-libre') + 'texlive-plainextra') provides=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-genericextra' 'texlive-plainextra') replaces=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-genericextra' - 'texlive-plainextra' - 'texlive-core-libre') + 'texlive-plainextra') url='http://tug.org/texlive/' mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip") -mksha256sums=('f7587a2bee24418494bb1ee8143c0ea7e057da91ca60ba7b380d1d5b6414cb54') +mksha256sums=('8e025c2dfa4e19dcb6aa5e661874d2c2a158aa2e1a078c11a4ddd6347bd9db45') noextract=("$pkgname-$pkgver-src.zip") source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"{,.sig} "$pkgname.maps" @@ -66,21 +64,23 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/web2c/fmtutil.cnf \ etc/texmf/web2c/mktex.cnf \ etc/texmf/xdvi/XDvi) -sha256sums=('8ee2be36aee76407811324738e83b427d0a526c55c9593e37665d035855db9a5' +sha256sums=('fd5c0d7a604ba0a0dbf06203f9ec68ae2d2e5cfdd43b1faeb6eb29960c593393' 'SKIP' '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3' - '5c41e6c46ae6868cfc8100a4478e33c965d69e54528672e513b4db8c9bef9c55' - '1d62d46d4d3a538ccad48d31192fccdfc8d6c0a60b331575a10a007d46812d46' + '09cbe0717c53078d30bdc378322f82e673dafbe7cf76a11e0a3c6dd54dcdfea3' + 'c76f01fe2a42e5860f7d0b2f16a4fc09101e1a14ea7488985e914cda749f1a21' '05afeae62a5d4c9de79c838c9636e2aefe9ad1d6b787fed4e5930c13baf60eba' - '9a0e462ad44d2ced432860ff62288b1c2f55b04c8d0c92887672478752417cf4' + '2141c0842668fb937fd21ca2fae39b642c9665656e404a0d4ee7bdc477bf51fe' 'ee6e76192a5ad880a2152cd7900b86c8465239fb228045a2f8360b0d7a449f4a' 'b641550fe7727422b6964d505db7dbc35b3680a9d47b8d97ac550828bdb9bac7' 'f96e9f815fa0a4b85e677f2a9215d9106b8abe46eceb3f3e36a6c76eda3e4a85' 'df669d731c0cb14d7702c0bd9228d35a2da2c941a684313ec11c9ed00ae1fb25' '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d' '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962') -validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58' # Omar Vega Ramos - '38D33EF29A7691134357648733466E12EC7BA943') # Isaac David +validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58' # Omar Vega Ramos + '38D33EF29A7691134357648733466E12EC7BA943' # Isaac David + '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger + mksource() { mkdir $pkgname-$pkgver @@ -135,20 +135,20 @@ package() { cd "$srcdir/$pkgname-$pkgver" # Install packages. - install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs + install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS - install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs - install -m644 $srcdir/$pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ - install -m644 $srcdir/$pkgname.fmts $pkgdir/var/lib/texmf/arch/installedpkgs/ - install -m755 -d $pkgdir/usr/share + install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs + install -m644 "$srcdir"/$pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/ + install -m644 "$srcdir"/$pkgname.fmts "$pkgdir"/var/lib/texmf/arch/installedpkgs/ + install -m755 -d "$pkgdir"/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do - find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \; - find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \; + find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \; + find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \; done - find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \; - find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \; - find texmf-dist -type f -executable -exec chmod 755 $pkgdir/usr/share/'{}' \; + find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \; + find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \; + find texmf-dist -type f -executable -exec chmod 755 "$pkgdir"/usr/share/'{}' \; ############################################################# ### install texmf tree @@ -202,13 +202,8 @@ package() { # replace upstream texmfcnf.lua with ours install -m644 "$srcdir"/texmfcnf.lua "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua - # create symlinks for formats - echo "--> Create symlinks for TeX formats ..." - mkdir -p "${pkgdir}/usr/bin" - bash "${pkgdir}"/usr/share/texmf-dist/scripts/texlive/texlinks.sh -f "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ - # use python2 instead of python for scripts. - sed -i '1s/python/python2/' $pkgdir/usr/share/texmf-dist/scripts/de-macro/de-macro + sed -i '1s/python/python2/' "$pkgdir"/usr/share/texmf-dist/scripts/de-macro/de-macro # install Perl libraries mv "$pkgdir"/usr/share/texmf-dist/tlpkg "$pkgdir"/usr/share @@ -221,19 +216,14 @@ package() { install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr" install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap" install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil" - - # copy config file to texmf-config - #mkdir -p $pkgdir/etc/texmf/tex/context/config - #cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \ - # $pkgdir/etc/texmf/tex/context/config/cont-usr.tex - + # remove upstream updmap.cfg: it contains too many maps. rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg" # remove upstream fmtutil.cnf: it will be autogenerated rm "${pkgdir}/usr/share/texmf-dist/web2c/fmtutil.cnf" # more cleanup - rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/ + rm -rf "$pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/" # link programs from /usr/share/texmf-dist/scripts _linked_scripts=" @@ -243,13 +233,16 @@ accfonts/vpl2ovp accfonts/vpl2vpl adhocfilelist/adhocfilelist.sh arara/arara.sh +attachfile2/pdfatfi.pl bundledoc/arlatex bundledoc/bundledoc checkcites/checkcites.lua checklistings/checklistings.sh +chklref/chklref.pl chktex/chkweb.sh chktex/deweb.pl cjk-gs-integrate/cjk-gs-integrate.pl +clojure-pamphlet/pamphletangler cluttex/cluttex.lua context/perl/mptopdf.pl context/stubs/unix/context @@ -275,6 +268,7 @@ fontools/autoinst fontools/ot2kpx fragmaster/fragmaster.pl installfont/installfont-tl +jfmutil/jfmutil.pl ketcindy/ketcindy.sh latex-git-log/latex-git-log latex-papersize/latex-papersize.py @@ -289,28 +283,15 @@ latexmk/latexmk.pl latexpand/latexpand ltxfileinfo/ltxfileinfo ltximg/ltximg.pl -lua2dox/lua2dox_filter luaotfload/luaotfload-tool.lua lwarp/lwarpmk.lua make4ht/make4ht match_parens/match_parens mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl -oberdiek/pdfatfi.pl pdfbook2/pdfbook2 pdfcrop/pdfcrop.pl -pdfjam/pdf180 -pdfjam/pdf270 -pdfjam/pdf90 -pdfjam/pdfbook -pdfjam/pdfflip pdfjam/pdfjam -pdfjam/pdfjam-pocketmod -pdfjam/pdfjam-slides3up -pdfjam/pdfjam-slides6up -pdfjam/pdfjoin -pdfjam/pdfnup -pdfjam/pdfpun pdflatexpicscale/pdflatexpicscale.pl pdftex-quiet/pdftex-quiet pdfxup/pdfxup @@ -320,12 +301,11 @@ pkfix-helper/pkfix-helper pkfix/pkfix.pl ps2eps/ps2eps.pl purifyeps/purifyeps -pythontex/pythontex.py pythontex/depythontex.py +pythontex/pythontex.py simpdftex/simpdftex srcredact/srcredact.pl sty2dtx/sty2dtx.pl -texcount/texcount.pl tex4ebook/tex4ebook tex4ht/ht.sh tex4ht/htcontext.sh @@ -337,56 +317,65 @@ tex4ht/htxelatex.sh tex4ht/htxetex.sh tex4ht/mk4ht.pl tex4ht/xhlatex.sh +texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texdoc/texdoc.tlu texdoctk/texdoctk.pl texfot/texfot.pl -texlive/allcm.sh -texlive/allneeded.sh -texlive/dvi2fax.sh -texlive/dvired.sh -texlive/e2pall.pl +texlive-extra/allcm.sh +texlive-extra/allneeded.sh +texlive-extra/dvi2fax.sh +texlive-extra/dvired.sh +texlive-extra/e2pall.pl +texlive-extra/fontinst.sh +texlive-extra/kpsetool.sh +texlive-extra/kpsewhere.sh +texlive-extra/ps2frag.sh +texlive-extra/pslatex.sh +texlive-extra/texconfig-dialog.sh +texlive-extra/texconfig-sys.sh +texlive-extra/texconfig.sh +texlive-extra/texlinks.sh texlive/fmtutil-sys.sh texlive/fmtutil-user.sh texlive/fmtutil.pl -texlive/fontinst.sh -texlive/kpsetool.sh -texlive/kpsewhere.sh -texlive/ps2frag.sh -texlive/pslatex.sh +texlive/mktexlsr +texlive/mktexmf +texlive/mktexpk +texlive/mktextfm texlive/rungs.tlu -texlive/texconfig-dialog.sh -texlive/texconfig-sys.sh -texlive/texconfig.sh -texlive/texlinks.sh texlive/updmap-sys.sh texlive/updmap-user.sh texlive/updmap.pl texliveonfly/texliveonfly.py texloganalyser/texloganalyser +texplate/texplate.sh thumbpdf/thumbpdf.pl typeoutfileinfo/typeoutfileinfo.sh xindex/xindex.lua xindy/texindy.pl xindy/xindy.pl " - install -m755 -d $pkgdir/usr/bin + install -m755 -d "$pkgdir/usr/bin" for _script in ${_linked_scripts}; do _scriptbase=$(basename $_script) _scriptbase=${_scriptbase%.*} - ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_scriptbase} + ln -s /usr/share/texmf-dist/scripts/${_script} "${pkgdir}/usr/bin/${_scriptbase}" done - ln -s /usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh ${pkgdir}/usr/bin/listings-ext.sh + ln -s /usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh "${pkgdir}/usr/bin/listings-ext.sh" # additional symlinks - ln -s allcm ${pkgdir}/usr/bin/allec - ln -s fmtutil ${pkgdir}/usr/bin/mktexfmt - ln -s kpsetool ${pkgdir}/usr/bin/kpsexpand - ln -s kpsetool ${pkgdir}/usr/bin/kpsepath - ln -s epstopdf ${pkgdir}/usr/bin/repstopdf - ln -s pdfcrop ${pkgdir}/usr/bin/rpdfcrop - ln -s luaotfload-tool ${pkgdir}/usr/bin/mkluatexfontdb - ln -s texdef ${pkgdir}/usr/bin/latexdef + ln -s allcm "${pkgdir}"/usr/bin/allec + ln -s cluttex "${pkgdir}"/usr/bin/cllualatex + ln -s cluttex "${pkgdir}"/usr/bin/clxelatex + ln -s epstopdf "${pkgdir}"/usr/bin/repstopdf + ln -s fmtutil "${pkgdir}"/usr/bin/mktexfmt + ln -s kpsetool "${pkgdir}"/usr/bin/kpsepath + ln -s kpsetool "${pkgdir}"/usr/bin/kpsexpand + ln -s luaotfload-tool "${pkgdir}"/usr/bin/mkluatexfontdb + ln -s mktexlsr "${pkgdir}"/usr/bin/texhash + ln -s pdfcrop "${pkgdir}"/usr/bin/rpdfcrop + ln -s texdef "${pkgdir}"/usr/bin/latexdef } diff --git a/libre/texlive-core/mktexlsr.hook b/libre/texlive-core/mktexlsr.hook index f1a3b8b38..7437aff87 100644 --- a/libre/texlive-core/mktexlsr.hook +++ b/libre/texlive-core/mktexlsr.hook @@ -1,5 +1,5 @@ [Trigger] -Type = File +Type = Path Operation = Install Operation = Upgrade Operation = Remove diff --git a/libre/texlive-core/texlive-core.fmts b/libre/texlive-core/texlive-core.fmts index 33dece86d..3c23eaf15 100644 --- a/libre/texlive-core/texlive-core.fmts +++ b/libre/texlive-core/texlive-core.fmts @@ -11,14 +11,16 @@ dviluatex luatex language.def,language.dat.lua dviluatex.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini latex pdftex language.dat -translate-file=cp227.tcx *latex.ini luacsplain luatex - -etex csplain.ini -#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini +luahbtex luahbtex language.def,language.dat.lua luatex.ini +luajithbtex luajithbtex language.def,language.dat.lua luatex.ini luajittex luajittex language.def,language.dat.lua luatex.ini -lualatex luatex language.dat,language.dat.lua lualatex.ini +lualatex luahbtex language.dat,language.dat.lua lualatex.ini luatex luatex language.def,language.dat.lua luatex.ini mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini #! mflua mflua-nowin - mf.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex +optex luatex hyphen-lan.opm optex.ini pdfcslatex pdftex - -etex cslatex.ini pdfcsplain luatex - -etex csplain.ini pdfcsplain pdftex - -etex -enc csplain-utf8.ini diff --git a/libre/texlive-core/texlive-updmap.hook b/libre/texlive-core/texlive-updmap.hook index 8bacce9a1..5e08c3267 100644 --- a/libre/texlive-core/texlive-updmap.hook +++ b/libre/texlive-core/texlive-updmap.hook @@ -1,5 +1,5 @@ [Trigger] -Type = File +Type = Path Operation = Install Operation = Upgrade Operation = Remove -- cgit v1.2.3