From 7184064103c7812856e9bd1ba5eaa6d697d01331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 27 Nov 2021 00:51:20 -0300 Subject: [PATCH] texlive: update to 20210325. For ownership.txt changes: - all files using the texlive version were identical between packages - tikztosvg had more features in texlive-pictures --- .../build-style/texmf/ownership.txt | 6 +++ srcpkgs/texlive/patches/tlmgr.patch | 44 +++++++------------ srcpkgs/texlive/template | 18 +++----- 3 files changed, 29 insertions(+), 39 deletions(-) diff --git a/common/environment/build-style/texmf/ownership.txt b/common/environment/build-style/texmf/ownership.txt index 0f41d75e205..01dcd2f0cc6 100644 --- a/common/environment/build-style/texmf/ownership.txt +++ b/common/environment/build-style/texmf/ownership.txt @@ -20,6 +20,7 @@ scripts/accfonts/mkt1font texlive scripts/accfonts/vpl2ovp texlive scripts/accfonts/vpl2vpl texlive scripts/adhocfilelist/adhocfilelist.sh texlive +scripts/albatross/albatross.sh texlive scripts/arara/arara.sh texlive scripts/attachfile2/pdfatfi.pl texlive scripts/authorindex/authorindex texlive @@ -71,8 +72,10 @@ scripts/fontools/autoinst texlive scripts/fontools/ot2kpx texlive scripts/fragmaster/fragmaster.pl texlive scripts/getmap/getmapdl.lua texlive +scripts/git-latexdiff/git-latexdiff texlive scripts/glossaries/makeglossaries-lite.lua texlive scripts/glossaries/makeglossaries texlive +scripts/hyperxmp/hyperxmp-add-bytecount.pl texlive scripts/installfont/installfont-tl texlive scripts/jfmutil/jfmutil.pl texlive scripts/ketcindy/ketcindy.pl texlive @@ -91,6 +94,7 @@ scripts/latexindent/latexindent.pl texlive scripts/latexmk/latexmk.pl texlive scripts/latexpand/latexpand texlive scripts/latex-papersize/latex-papersize.py texlive +scripts/light-latex-make/llmk.lua texlive scripts/lilyglyphs/lily-glyph-commands.py texlive-music scripts/lilyglyphs/lily-image-commands.py texlive-music scripts/lilyglyphs/lily-rebuild-pdfs.py texlive-music @@ -122,6 +126,7 @@ scripts/pdfxup/pdfxup texlive scripts/pedigree-perl/pedigree.pl texlive-pstricks scripts/perltex/perltex.pl texlive scripts/petri-nets/pn2pdf texlive +scripts/tikztosvg/tikztosvg texlive-pictures scripts/pfarrei/a5toa4.tlu texlive scripts/pfarrei/pfarrei.tlu texlive scripts/pkfix-helper/pkfix-helper texlive @@ -144,6 +149,7 @@ scripts/pythontex/depythontex.py texlive scripts/pythontex/pythontex.py texlive scripts/rubik/rubikrotation.pl texlive-games scripts/simpdftex/simpdftex texlive +scripts/spix/spix.py texlive scripts/splitindex/splitindex.pl texlive scripts/srcredact/srcredact.pl texlive scripts/sty2dtx/sty2dtx.pl texlive diff --git a/srcpkgs/texlive/patches/tlmgr.patch b/srcpkgs/texlive/patches/tlmgr.patch index ef3ae26e736..b4c1c02e894 100644 --- a/srcpkgs/texlive/patches/tlmgr.patch +++ b/srcpkgs/texlive/patches/tlmgr.patch @@ -11,26 +11,21 @@ Modified by fosslinux. --- a/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/texk/texlive/linked_scripts/texlive/tlmgr.pl -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ $datrev =~ s/^.*Date: //; + $datrev =~ s/ \(.*$//; $tlmgrversion = "$tlmgrrevision ($datrev)"; - our $Master; --our $ismain; -+our $ismain = 1; +-our $Master; ++our $Master = "/usr/share/texmf-dist"; our $loadmediasrcerror; our $packagelogfile; our $packagelogged; -@@ -41,50 +41,8 @@ +@@ -39,38 +39,9 @@ END { + } BEGIN { - $^W = 1; -- $ismain = (__FILE__ eq $0); -- # WARNING -- # The only use anticipated for tlmgr.pl as library for the 2009 release -- # is the Windows w32client prototype script. -- # Unix-specific problems with use as library will probably go undetected. -- -- # make subprograms (including kpsewhich) have the right path: +- $^W = 1; + # make subprograms (including kpsewhich) have the right path: - my $kpsewhichname; - if ($^O =~ /^MSWin/i) { - # on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative @@ -44,14 +39,8 @@ Modified by fosslinux. - } else { - $Master = __FILE__; - $Master =~ s,/*[^/]*$,,; -- if ($ismain) { -- $bindir = $Master; -- $Master = "$Master/../.."; -- } else { -- # for the time being, this code will not be used or tested -- $Master = "$Master/../../.."; -- # no code yet for $bindir; would have to detect platform -- } +- $bindir = $Master; +- $Master = "$Master/../.."; - # make subprograms (including kpsewhich) have the right path: - $ENV{"PATH"} = "$bindir:$ENV{PATH}"; - $kpsewhichname = "kpsewhich"; @@ -67,13 +56,12 @@ Modified by fosslinux. - die ("Could not determine directory of tlmgr executable, " - . "maybe shared library woes?\nCheck for error messages above"); - } -- -+ -+ $Master = "/usr/share/texmf-dist"; ++ $bindir = $Master; ++ $ENV{"PATH"} = "$bindir:$ENV{PATH}"; + $::installerdir = $Master; # for config.guess et al., see TLUtils.pm - # make Perl find our packages first: -@@ -621,6 +579,13 @@ +@@ -615,6 +586,13 @@ for the full story.\n"; tldie("$prg: Try --help if you need it.\n"); } @@ -87,7 +75,7 @@ Modified by fosslinux. # # the main tree we will be working on $::maintree = $Master; -@@ -6099,7 +6064,9 @@ +@@ -6118,7 +6096,9 @@ sub action_postaction { # sets up the user tree for tlmgr in user mode sub action_init_usertree { # init_local_db but do not die if localtlpdb is not found! @@ -98,7 +86,7 @@ Modified by fosslinux. my $tlpdb = TeXLive::TLPDB->new; my $usertree; if ($opts{"usertree"}) { -@@ -6739,7 +6706,11 @@ +@@ -6758,7 +6738,11 @@ sub init_local_db { if ($should_i_die == 2) { return undef; } else { diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index 06e527a5258..7c1a5079c77 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -1,7 +1,7 @@ # Template file for 'texlive' pkgname=texlive -version=20200406 -revision=10 +version=20210325 +revision=1 wrksrc="texlive-${version}-source" build_wrksrc="build" build_style=gnu-configure @@ -47,6 +47,7 @@ configure_args=" --disable-ttf2pk2 --disable-vlna --disable-xindy + --disable-xpdfopen --with-ps=gs --with-banner-add=/VoidLinux --with-system-cairo @@ -62,7 +63,6 @@ configure_args=" --with-system-poppler --with-system-pixman --with-system-teckit - --with-system-xpdf --with-system-zlib --with-system-zziplib --with-xdvi-x-toolkit=Xaw" @@ -71,13 +71,13 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel" -depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.119_1" +depends="dialog ghostscript perl-Tk texlive-core xbps-triggers" short_desc="TeX Live" maintainer="fosslinux " license="GPL-2.0-or-later" -homepage="https://www.tug.org/texlive/" -distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz" -checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +homepage="https://tug.org/texlive/" +distfiles="ftp://tug.org/texlive/historic/2021/texlive-${version}-source.tar.xz" +checksum=7aefd96608d72061970f2d73f275be5648ea8ae815af073016d3106acc0d584b python_version=3 # Virtual package cares only about year part of version provides="tex-${version%${version#????}}_1" @@ -134,10 +134,6 @@ esac export DASM_ARCH post_extract() { - # pdftex poppler compatibility - cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc - cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc - mkdir -p "${build_wrksrc}" cp -rf texk/web2c "${build_wrksrc}/web2c-host" }