diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/ap/mc/mc.SlackBuild | 3 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/ChangeLog | 6 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/core-functions.sh | 30 | ||||
| -rwxr-xr-x | source/ap/slackpkg/slackpkg.SlackBuild | 2 | ||||
| -rw-r--r-- | source/kde/kde/build/digikam | 2 | ||||
| -rw-r--r-- | source/kde/kde/build/kio-extras | 2 | ||||
| -rwxr-xr-x | source/l/kdsoap/kdsoap.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/t/texlive/dump.unused.internal.libraries.from.sources.sh | 3 | ||||
| -rw-r--r-- | source/t/texlive/patches/fixes-210420.patch | 162 | ||||
| -rw-r--r-- | source/t/texlive/patches/tabu.sty.diff | 32 | ||||
| -rw-r--r-- | source/t/texlive/prep/texmf_get.sh | 76 | ||||
| -rwxr-xr-x | source/t/texlive/texlive.SlackBuild | 58 | ||||
| -rw-r--r-- | source/t/texlive/texlive.url | 4 |
13 files changed, 267 insertions, 115 deletions
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild index ac79ef0d..5f8ba10d 100755 --- a/source/ap/mc/mc.SlackBuild +++ b/source/ap/mc/mc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mc VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -91,6 +91,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-netcode \ --enable-background \ --enable-charset \ + --enable-aspell \ --with-gpm-mouse \ --with-ext2undel \ --with-x=yes \ diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog index 08608ae5..aa6dba54 100644 --- a/source/ap/slackpkg/files/ChangeLog +++ b/source/ap/slackpkg/files/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 6 03:01:40 UTC 2021 +--------------- + - Release 15.0.6 + - Fix getting gpg key on ARM ; use only www.slackware.com + - Remove support for Slackintosh project - it's dead, Jim + Sat Jun 5 03:54:45 UTC 2021 --------------- - Release 15.0.5 diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh index 69f80620..ea38f299 100644 --- a/source/ap/slackpkg/files/core-functions.sh +++ b/source/ap/slackpkg/files/core-functions.sh @@ -137,11 +137,6 @@ function system_setup() { SLACKKEY=${SLACKKEY:-"Slackware ARM (Slackware ARM Linux Project) <mozes@slackware.com>"} PKGMAIN=${PKGMAIN:-slackware} ;; - powerpc|ppc) - ARCH=powerpc - SLACKKEY=${SLACKKEY:-"Slackintosh-Project Sign <slackdev@workaround.ch>"} - PKGMAIN=${PKGMAIN:-slackintosh} - ;; *) ARCH=none ;; @@ -555,19 +550,23 @@ function checkgpg() { gpg --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0" } +# Fetch $SLACKKEY from a trusted source function get_gpg_key() { - if ping -c 1 slackware.com &>/dev/null; then - echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/GPG-KEY" - $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/GPG-KEY &>/dev/null - elif ping -c 1 mirrors.slackware.com &>/dev/null; then - echo -e "\t\t\tGetting key from https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY" - $DOWNLOADER $TMPDIR/gpgkey https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY &>/dev/null + if ping -c 1 www.slackware.com &>/dev/null; then + if printf "$ARCH" | grep -q -e "arm" -e "aarch64" &>/dev/null ; then + echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/arm/GPG-KEY" + $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/arm/GPG-KEY &>/dev/null + # Backup: https://arm.slackware.com/keys/GPG-KEY + else + echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/GPG-KEY" + $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/GPG-KEY &>/dev/null + # Backup: https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY + fi else echo -e "\ -slackpkg is unable to get the Slackware GPG key from either\n\ -slackware.com or mirrors.slackware.com; if you trust the\n\ -source you have configured in /etc/slackpkg/mirrors, slackpkg\n\ -can import the GPG key from that source.\n\ +slackpkg is unable to get the Slackware GPG key from www.slackware.com\n\ +If you trust the source you have configured in /etc/slackpkg/mirrors,\n\ +slackpkg can import the GPG key from that source.\n\ The source currently in use is:\n\ \t ${SOURCE}\n\ Do you want to import the GPG key from this source? (YES|NO)\n" @@ -584,6 +583,7 @@ Do you want to import the GPG key from this source? (YES|NO)\n" fi } +# Import $SLACKKEY function import_gpg_key() { mkdir -p ~/.gnupg gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 60dcf16e..3ad02540 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg -VERSION=${VERSION:-15.0.5} +VERSION=${VERSION:-15.0.6} ARCH="noarch" BUILD=${BUILD:-1} diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index 00750edc..b8626c4c 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/build/kio-extras b/source/kde/kde/build/kio-extras index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/kio-extras +++ b/source/kde/kde/build/kio-extras @@ -1 +1 @@ -1 +2 diff --git a/source/l/kdsoap/kdsoap.SlackBuild b/source/l/kdsoap/kdsoap.SlackBuild index 24b0a877..c6df5a08 100755 --- a/source/l/kdsoap/kdsoap.SlackBuild +++ b/source/l/kdsoap/kdsoap.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=kdsoap VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/t/texlive/dump.unused.internal.libraries.from.sources.sh b/source/t/texlive/dump.unused.internal.libraries.from.sources.sh index 9f3c0126..11f775ed 100755 --- a/source/t/texlive/dump.unused.internal.libraries.from.sources.sh +++ b/source/t/texlive/dump.unused.internal.libraries.from.sources.sh @@ -8,10 +8,9 @@ mv texlive-${VERSION}-source.tar.xz texlive-${VERSION}-source.tar.xz.orig ( cd texlive-${VERSION}-source/libs && rm -rf cairo freetype2 gd gmp graphite2 harfbuzz mpfr icu libpng pixman potrace zlib ) ( cd texlive-${VERSION}-source/utils && rm -rf asymptote ) ( cd texlive-${VERSION}-source/texk && rm -rf dvisvgm ) -( cd texlive-${VERSION}-source/texk/web2c && rm -rf alephdir ) ( cd texlive-${VERSION}-source/texk/texlive && rm -rf w*_wrapper ) tar cf texlive-${VERSION}-source.tar texlive-${VERSION}-source rm -r texlive-${VERSION}-source -xz -9 texlive-${VERSION}-source.tar +xz texlive-${VERSION}-source.tar touch -r texlive-${VERSION}-source.tar.xz.orig texlive-${VERSION}-source.tar.xz rm texlive-${VERSION}-source.tar.xz.orig diff --git a/source/t/texlive/patches/fixes-210420.patch b/source/t/texlive/patches/fixes-210420.patch new file mode 100644 index 00000000..345b479e --- /dev/null +++ b/source/t/texlive/patches/fixes-210420.patch @@ -0,0 +1,162 @@ +diff -ru texlive-20210324-source/texk/web2c/luatexdir/ChangeLog source/texk/web2c/luatexdir/ChangeLog +--- texlive-20210324-source/texk/web2c/luatexdir/ChangeLog 2021-03-23 18:33:25.000000000 +0100 ++++ source/texk/web2c/luatexdir/ChangeLog 2021-04-19 07:46:56.693445474 +0200 +@@ -1,3 +1,12 @@ ++2021-04-10 Luigi Scarso <luigi.scarso@gmail.com> ++ * LuaTeX version 1.13.2 with MetaPost 2.01. ++ The version change in MetaPost ++ is due solely to the bug fix in btex .. etex ++ ++2021-04-02 Luigi Scarso <luigi.scarso@gmail.com> ++ * LuaTeX version 1.13.1, ++ The version change is due solely to the bug fix in btex .. etex ++ + 2021-03-23 Karl Berry <karl@tug.org> + * TL'21. + +diff -ru texlive-20210324-source/texk/web2c/luatexdir/NEWS source/texk/web2c/luatexdir/NEWS +--- texlive-20210324-source/texk/web2c/luatexdir/NEWS 2021-03-12 23:55:21.000000000 +0100 ++++ source/texk/web2c/luatexdir/NEWS 2021-04-19 07:46:56.695445474 +0200 +@@ -1,4 +1,23 @@ + ============================================================== ++LuaTeX 1.13.2 2021-04-10 ++============================================================== ++ ++MetaPost 2.01 (to mark the patch on the unwanted space in ++btex etex). ++ ++ ++ ++============================================================== ++LuaTeX 1.13.1 2021-04-02 ++============================================================== ++ ++Fixed an unwanted space in btex etex in metapost, introduced ++after a patch for troff. ++ ++ ++ ++ ++============================================================== + LuaTeX 1.13.0 2021-03-12 + ============================================================== + +diff -ru texlive-20210324-source/texk/web2c/luatexdir/luatex.c source/texk/web2c/luatexdir/luatex.c +--- texlive-20210324-source/texk/web2c/luatexdir/luatex.c 2021-02-25 20:15:40.000000000 +0100 ++++ source/texk/web2c/luatexdir/luatex.c 2021-04-19 07:46:59.292445512 +0200 +@@ -33,8 +33,8 @@ + */ + + int luatex_version = 113; +-int luatex_revision = '0'; +-const char *luatex_version_string = "1.13.0"; ++int luatex_revision = '2'; ++const char *luatex_version_string = "1.13.2"; + const char *engine_name = my_name; + + #include <kpathsea/c-ctype.h> +diff -ru texlive-20210324-source/texk/web2c/luatexdir/luatex_svnversion.h source/texk/web2c/luatexdir/luatex_svnversion.h +--- texlive-20210324-source/texk/web2c/luatexdir/luatex_svnversion.h 2021-03-16 22:21:41.000000000 +0100 ++++ source/texk/web2c/luatexdir/luatex_svnversion.h 2021-04-19 07:46:59.293445512 +0200 +@@ -1 +1 @@ +-#define luatex_svn_revision 7418 ++#define luatex_svn_revision 7430 +diff -ru texlive-20210324-source/texk/web2c/mplibdir/ChangeLog source/texk/web2c/mplibdir/ChangeLog +--- texlive-20210324-source/texk/web2c/mplibdir/ChangeLog 2021-03-23 18:33:25.000000000 +0100 ++++ source/texk/web2c/mplibdir/ChangeLog 2021-04-19 07:47:01.823445550 +0200 +@@ -1,10 +1,15 @@ ++2021-04-10 Luigi Scarso <luigi.scarso@gmail.com> ++ * Metapost version 2.01 (needed to mark the patch mpx_copy_mpto). ++ ++2021-04-02 Luigi Scarso <luigi.scarso@gmail.com> ++ * Revert the patch in mpx_copy_mpto, it was wrong in tex mode. Added a check if in troff mode. ++ + 2021-03-23 Karl Berry <karl@tug.org> + * TL'21. + + 2020-12-28 Luigi Scarso <luigi.scarso@gmail.com> + * Temp, fix in mpx_copy_mpto, changed || with && to avoid a wrong final % + +- + 2020-12-27 Luigi Scarso <luigi.scarso@gmail.com> + * Fixed some typos in manual (thank to 胡亚捷 (Hu Yajie) ) + * Added the undocumented -T option +diff -ru texlive-20210324-source/texk/web2c/mplibdir/am/libmplib.am source/texk/web2c/mplibdir/am/libmplib.am +--- texlive-20210324-source/texk/web2c/mplibdir/am/libmplib.am 2021-02-25 20:15:51.000000000 +0100 ++++ source/texk/web2c/mplibdir/am/libmplib.am 2021-04-19 07:47:01.824445550 +0200 +@@ -1,6 +1,6 @@ + ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. + ## +-## Copyright (C) 2015-2020 Luigi Scarso <tex-live@tug.org> ++## Copyright (C) 2015-2021 Luigi Scarso <tex-live@tug.org> + ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> + ## You may freely use, modify and/or distribute this file. + +diff -ru texlive-20210324-source/texk/web2c/mplibdir/am/mplib.am source/texk/web2c/mplibdir/am/mplib.am +--- texlive-20210324-source/texk/web2c/mplibdir/am/mplib.am 2021-02-25 20:15:51.000000000 +0100 ++++ source/texk/web2c/mplibdir/am/mplib.am 2021-04-19 07:47:01.826445550 +0200 +@@ -1,6 +1,6 @@ + ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. + ## +-## Copyright 2017-2018 Luigi Scarso <tex-live@tug.org> ++## Copyright 2017-2021 Luigi Scarso <tex-live@tug.org> + ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> + ## You may freely use, modify and/or distribute this file. + +diff -ru texlive-20210324-source/texk/web2c/mplibdir/mp.w source/texk/web2c/mplibdir/mp.w +--- texlive-20210324-source/texk/web2c/mplibdir/mp.w 2021-02-25 20:15:52.000000000 +0100 ++++ source/texk/web2c/mplibdir/mp.w 2021-04-19 07:47:01.967445552 +0200 +@@ -71,12 +71,12 @@ + @^extensions to \MP@> + @^system dependencies@> + +-@d default_banner "This is MetaPost, Version 2.00" /* printed when \MP\ starts */ ++@d default_banner "This is MetaPost, Version 2.01" /* printed when \MP\ starts */ + @d true 1 + @d false 0 + + @<Metapost version header@>= +-#define metapost_version "2.00" ++#define metapost_version "2.01" + + @ The external library header for \MP\ is |mplib.h|. It contains a + few typedefs and the header defintions for the externally used +diff -ru texlive-20210324-source/texk/web2c/mplibdir/mpxout.w source/texk/web2c/mplibdir/mpxout.w +--- texlive-20210324-source/texk/web2c/mplibdir/mpxout.w 2021-02-25 20:15:52.000000000 +0100 ++++ source/texk/web2c/mplibdir/mpxout.w 2021-04-19 07:47:01.979445552 +0200 +@@ -564,7 +564,7 @@ + if (textype == B_TEX) { + /* put no |%| at end if it's only 1 line total, starting with |%|; + * this covers the special case |%&format| in a single line. */ +- if (t != s && *t != '%') ++ if ((t != s || *t != '%') && mpx->mode == mpx_tex_mode) + fprintf(outfile,"%%"); + } + free(res); +diff -ru texlive-20210324-source/texk/web2c/pmpostdir/pmp.ch source/texk/web2c/pmpostdir/pmp.ch +--- texlive-20210324-source/texk/web2c/pmpostdir/pmp.ch 2021-02-25 20:16:12.000000000 +0100 ++++ source/texk/web2c/pmpostdir/pmp.ch 2021-04-20 07:00:12.086686937 +0200 +@@ -13,19 +13,19 @@ + % + + @x +-@d default_banner "This is MetaPost, Version 2.00" /* printed when \MP\ starts */ ++@d default_banner "This is MetaPost, Version 2.01" /* printed when \MP\ starts */ + @y + @z + + @x +-#define metapost_version "2.00" ++#define metapost_version "2.01" + @y + #ifdef UPMP + #define P_UP "up" +-#define metapost_version "2.00-0.04-u1.27" ++#define metapost_version "2.01-0.04-u1.27" + #else + #define P_UP "p" +-#define metapost_version "2.00-0.04" ++#define metapost_version "2.01-0.04" + #endif + #define default_banner "This is " P_UP "MetaPost, Version " metapost_version /* printed when \MP\ starts */ + @z diff --git a/source/t/texlive/patches/tabu.sty.diff b/source/t/texlive/patches/tabu.sty.diff deleted file mode 100644 index 8ebe034d..00000000 --- a/source/t/texlive/patches/tabu.sty.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- ./tabu.sty.orig 2019-01-14 16:10:48.000000000 -0600 -+++ ./tabu.sty 2019-06-30 16:24:01.975474339 -0500 -@@ -57,7 +57,7 @@ - %% - - \NeedsTeXFormat{LaTeX2e} --\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)] -+\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed) + intermediate FMi] - \RequirePackage{array}[2008/09/09] - \RequirePackage{varwidth}[2009/03/30] - \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} -@@ -727,6 +727,10 @@ - \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}% - \fi - }% \tabu@init -+%%TABU-FIXED set up \tabu@currentgrouptype -+%FMi cancel for nested arrays ... -+\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}} -+ - \def\tabu@indent{% correction for indentation - \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget - \everypar\expandafter{% -@@ -1663,6 +1667,9 @@ - \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target - \tabu@target=\tabu@temp\tabucolX \fi\fi - \setbox\tabu@box \hbox \bgroup -+%%TABU-FIXED add \color@begingroup -+%%FMi not yet understood why this one is also needed ... -+ \color@begingroup - \begin{varwidth}\tabu@target - \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width... - \narrowragged \arraybackslash \parfillskip \@flushglue diff --git a/source/t/texlive/prep/texmf_get.sh b/source/t/texlive/prep/texmf_get.sh index c66a71b7..2732f087 100644 --- a/source/t/texlive/prep/texmf_get.sh +++ b/source/t/texlive/prep/texmf_get.sh @@ -2,7 +2,7 @@ # texmf_get.sh # -# Copyright 2016 - 2020 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info +# Copyright 2016 - 2021 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# V 15.0.4 +# V 15.0.5 # # Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb # This script takes care of dependencies(as far as these are present in texlive.tlpdb) @@ -38,13 +38,14 @@ # packages from any collection. #set -e -MAJORVERSION=2020 mirror="http://mirror.ctan.org/systems/texlive/tlnet/" +# Pre-test mirror for new releases +#mirror="http://ftp.cstug.cz/pub/tex/local/tlpretest/" TMP=${TMP:-$PWD/tmp} # Globally excluded packages, which are/contain # -useless without tlmgr-installer -# -non-linux, e.g. texworks +# -non-linux, e.g. texworks(windows binary) # -covered by an external package, e.g. asymptote on SBo # -obsolete, e.g. omega # -binaries provided already by texlive.Slackbuild @@ -96,8 +97,6 @@ special_packages=" ptex-fonts uptex-fonts " -#Todo: split type1 fonts, or keep subset of type1 fonts in base -# cm-super # keep precompiled binaries, list binary, not package name keep_precompiled=" @@ -108,6 +107,36 @@ texmf_editions () { # "excludes from -base", also dependencies are excluded PACKAGES=" + albatross + antiqua + augie + aspectratio + calligra-type1 + causets + chhaya + chifoot + chinese-jfm + color-edits + econlipsum + ekdosis + esvect + figchild + fonetika + hitreport + mahjong + matapli + newpax + numerica + pdfmanagement-testphase + profcollege + rojud + svrsymbols + tikz-among-us + tkz-berge + tkz-graph + tzplot + typicons + zztex cm-super biber bib2gls @@ -166,6 +195,14 @@ texmf_editions () { # packages/collections and their dependencies for -extra PACKAGES=" $(grep ^"name .*biblatex" $db | cut -d' ' -f2 ) + aalok + algpseudocodex + association-matrix + beamerthemelalic + beamerthemenord + beaulivre + bithesis + bubblesort amiri arabi arabi-add @@ -194,9 +231,11 @@ texmf_editions () { ctanupload dad duckuments + easybook ethiop-t1 fibeamer fithesis + fonetika ghsystem gregoriotex hustthesis @@ -212,20 +251,26 @@ texmf_editions () { lilyglyphs lni luatexko + lua-physical media9 musuos mwe newtx nwejm + obnov padauk pdfwin pdfx powerdot-tuliplab powerdot-fuberlin + profcollege quran + quran-bn quran-de + quran-ur realhats resumecls + rojud sanskrit-t1 sapthesis sduthesis @@ -235,6 +280,7 @@ texmf_editions () { stellenbosch suanpan texdoctk + texnegar tudscr uantwerpendocs udesoftec @@ -747,15 +793,14 @@ lint () { echo "Comparing content of all editions, this may take a while ..." cd $TMP # check if all editions of same VERSION are there, take -base as reference -lint_version=$( ls texlive-base-*tar.xz | head -n1 | cut -d'.' -f2 || exit 1) -if [ -s texlive-extra-$MAJORVERSION.$lint_version.tar.xz \ - -a -s texlive-docs-$MAJORVERSION.$lint_version.tar.xz ] +if [ -s texlive-extra-$VERSION.tar.xz \ + -a -s texlive-docs-$VERSION.tar.xz ] then for edition in base extra docs do - echo "Extracting index of texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz ..." + echo "Extracting index of texlive-${edition}-$VERSION.tar.xz ..." # don't list directories - tar tf texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz | grep -v '/'$ > $TMP/packages.$edition.lint + tar tf texlive-${edition}-$VERSION.tar.xz | grep -v '/'$ > $TMP/packages.$edition.lint done # compare content @@ -819,8 +864,7 @@ echo "Building $edition tarball ..." # Set VERSION, get texlive.tlpdb and keep unshorten $db.orig if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ] then - echo $MAJORVERSION.$(date +%y%m%d) > VERSION - #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb + echo $(date +%y%m%d) > VERSION wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz unxz ${db}.orig.xz @@ -945,7 +989,7 @@ do # Calculate package-minimal size, uncompressed and compressed mkdir -p calculate/texmf-dist tar xf $texmf/$package.tar.xz -C calculate/texmf-dist --exclude-from=$files_split.tmp - tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist + tar cf calculate/calc.tar.xz -I 'xz' calculate/texmf-dist size_minimal=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//") size_minimal_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )" sed -i \ @@ -961,7 +1005,7 @@ do then mkdir -p calculate/texmf-dist tar xf $texmf/${package}.tar.xz -C calculate/texmf-dist $(paste $files_split.tmp) - tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist + tar cf calculate/calc.tar.xz -I 'xz' calculate/texmf-dist size_extended=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//") size_extended_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | \ grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )" @@ -1140,7 +1184,7 @@ rm -rf texmf-dist # compress the tarball as everything is in place now echo "Compressing $tarball ..." [ -f $tarball.xz ] && rm $tarball.xz -xz -9 -T0 $tarball || exit 1 +xz -T0 $tarball || exit 1 md5sum $tarball.xz ls -lh $tarball.xz echo "Logfile: $logfile" diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild index 7fa89ebf..064ed234 100755 --- a/source/t/texlive/texlive.SlackBuild +++ b/source/t/texlive/texlive.SlackBuild @@ -2,7 +2,7 @@ # TeXLive build script for Slackware -# Copyright 2009, 2017 - 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2017 - 2021 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009 - 2014 Robby Workman, Northport, AL, USA # Copyright 2016 - 2017 Johannes Schoepfer, Germany # All rights reserved. @@ -26,14 +26,15 @@ # URL: ftp://tug.org/historic/systems/texlive/ # Testrelease: ftp://tug.org/texlive/Images/test/ -# Upstream stable fixes: svn://tug.org/texlive/branches/branch2020/Build/source +# Upstream stable fixes: svn://tug.org/texlive/branches/branch2021/Build/source cd $(dirname $0) ; CWD=$(pwd) PKGNAM=texlive -SOURCEVERSION=${SOURCEVERSION:-20200327} -VERSION=${VERSION:-2020.200608} -BUILD=${BUILD:-5} +SOURCEVERSION=${SOURCEVERSION:-20210324} +TEXMFVERSION=${TEXMFVERSION:-210418} +VERSION=${VERSION:-2021.$TEXMFVERSION} +BUILD=${BUILD:-1} TMP=${TMP:-/tmp} PKG=$TMP/package-texlive @@ -67,19 +68,6 @@ else LIBDIRSUFFIX="" fi -TEXMFROOT=/usr/share - -# NOTE: Using the system version of poppler will require texlive to be -# recompiled with pretty much every poppler update, as they almost always -# bump the shared library version. But sometimes you do what you have -# to do... -SYSTEMPOPPLER=${SYSTEMPOPPLER:-NO} -if [ "$SYSTEMPOPPLER" = "NO" ]; then - POPPLER="--without-system-poppler --without-system-xpdf" -else - POPPLER="--with-system-poppler --with-system-xpdf" -fi - rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -89,23 +77,13 @@ cd texlive-$SOURCEVERSION-source || exit 1 chown -R root:root . chmod -R u+w,go-w,a+rX-st . -export LANG=C -export PATH="$PKG/usr/bin:$PATH" -export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH" - -# set TEXMFROOT and TEXMFLOCAL -sed -i \ - -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \ - -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \ - texk/kpathsea/texmf.cnf - -# prevent compiling Xdvi with libXp -sed -i 's|-lXp ||' texk/xdvik/configure +# fixes from stable branch +cat $CWD/patches/fixes-210420.patch | patch -p1 --verbose || exit 1 mkdir build cd build CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS -fpermissive" \ + CXXFLAGS="$SLKCFLAGS" \ ../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -120,7 +98,6 @@ cd build --disable-multiplatform \ --disable-debug \ --disable-dialog \ - --disable-bibtexu \ --disable-xz \ --with-x \ --disable-dvisvgm \ @@ -143,14 +120,11 @@ cd build --with-system-fontconfig \ --with-system-ncurses \ --with-system-harfbuzz \ - --disable-aleph \ - --disable-dump-share \ --disable-linked-scripts \ - $POPPLER \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 - # make check || exit 1 + make check || exit 1 make install-strip DESTDIR=$PKG || exit 1 cd .. @@ -158,18 +132,22 @@ cd .. # Don't ship .la files: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la +TEXMFROOT=/usr/share + # Remove all files which are covered by tlnet rm -rf $PKG$TEXMFROOT $PKG/usr/man $PKG/usr/info # install the tlnet stuff mkdir -p $PKG$TEXMFROOT -tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG$TEXMFROOT || exit 1 +tar xvf $CWD/texlive-base-$TEXMFVERSION.tar.xz -C $PKG$TEXMFROOT || exit 1 chown -R root:root $PKG chmod -R u+w,go-w,a+rX-st $PKG # use symlinks/scripts from tlnet mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG/usr/bin rmdir $PKG$TEXMFROOT/texmf-dist/linked_scripts +# xindy expects to be executed within $TEXMFROOT/texmf-dist/scripts +ln -sf $TEXMFROOT/texmf-dist/scripts/xindy/xindy.pl $PKG/usr/bin/xindy # set some paths sed -i \ @@ -220,12 +198,6 @@ cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg # Create some directories to make it clear that they're owned by this package mkdir -p $PKG$TEXMFROOT/{texmf-config,texmf-var,texmf-local} -# Use patch for tabu.sty from https://github.com/tabu-fixed/tabu to fix -# breakage when compiling doxygen: -( cd $PKG$TEXMFROOT/texmf-dist/tex/latex/tabu - cat $CWD/patches/tabu.sty.diff | patch -p1 --verbose || exit 1 -) || exit 1 - # Add texlive perl modules mkdir -p $PKG/usr/share/perl5 mv $PKG$TEXMFROOT/texmf-dist/scripts/texlive/TeXLive $PKG/usr/share/perl5/ diff --git a/source/t/texlive/texlive.url b/source/t/texlive/texlive.url index dcac2150..31cfdda0 100644 --- a/source/t/texlive/texlive.url +++ b/source/t/texlive/texlive.url @@ -1,2 +1,2 @@ -https://ctan.net/systems/texlive/Source/texlive-20200327-source.tar.xz -http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-2020.200608.tar.xz +https://ctan.net/systems/texlive/Source/texlive-20210324-source.tar.xz +http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-210418.tar.xz |