diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-07-06 03:15:37 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-07-06 21:00:35 +0200 |
commit | d880dd2b82a72946ef2bfc89a5c8164687878c11 (patch) | |
tree | 1bbcd1b2132abd2254fe46009e120f8e490db5d7 /source/t/texlive/texlive.SlackBuild | |
parent | 4295accb5f5f4c0c8ec00f664bd6f579de4a8140 (diff) | |
download | current-d880dd2b82a72946ef2bfc89a5c8164687878c11.tar.gz |
Fri Jul 6 03:15:37 UTC 201820180706031537
t/texlive-2018.180630-x86_64-1.txz: Upgraded.
Thanks to Johannes Schoepfer.
x/libXScrnSaver-1.2.3-x86_64-1.txz: Upgraded.
x/libXinerama-1.1.4-x86_64-1.txz: Upgraded.
x/libXxf86misc-1.0.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/t/texlive/texlive.SlackBuild')
-rwxr-xr-x | source/t/texlive/texlive.SlackBuild | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild index f68f4608..805b9858 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, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2017 - 2018 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009-2014 Robby Workman, Northport, AL, USA # Copyright 2016-2017 Johannes Schoepfer, Germany # All rights reserved. @@ -26,13 +26,14 @@ # URL: ftp://tug.org/historic/systems/texlive/ # Testrelease: ftp://tug.org/texlive/Images/test/ +# Upstream stable fixes: svn://tug.org/texlive/branches/branch2018/Build/source cd $(dirname $0) ; CWD=$(pwd) PKGNAM=texlive -SOURCEVERSION=${SOURCEVERSION:-20170520} -VERSION=${VERSION:-2017.171108} -BUILD=${BUILD:-7} +SOURCEVERSION=${SOURCEVERSION:-20180414} +VERSION=${VERSION:-2018.180630} +BUILD=${BUILD:-1} TMP=${TMP:-/tmp} PKG=$TMP/package-texlive @@ -99,13 +100,15 @@ sed -i \ # prevent compiling Xdvi with libXp sed -i 's|-lXp ||' texk/xdvik/configure -# Thanks to the lfs-folks ... -patch -Np1 -i $CWD/patches/texlive-20170524-source-gcc7-1.patch || exit 1 -patch -Np1 -i $CWD/patches/texlive-20170524-source-upstream_fixes-2.patch || exit 1 +# Upstream stable fixes +patch -Np0 -i $CWD/patches/20180625.diff || exit 1 -# Thanks to archlinux for the poppler-0.59 API fixup patch: +# The 2018 version of texlive ships with support for poppler-0.57.0 and older, +# but it includes alternative newpoppler files which enable building with +# poppler-0.62.0 or newer. if [ ! "$SYSTEMPOPPLER" = "NO" ]; then - patch -Np1 -i $CWD/patches/texlive-poppler-0.59.patch || exit 1 + mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc || exit 1 + mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc || exit 1 fi # --with-system-harfbuzz requires graphite2 (and harfbuzz linked to it) @@ -148,36 +151,37 @@ cd build --without-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 install-strip DESTDIR=$PKG || exit 1 - - # Don't ship .la files: - rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la - # Remove all files which are covered by tlnet - rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info +cd .. - # install the tlnet stuff - mkdir -p $PKG/usr/share - tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1 - chown -R root:root $PKG - chmod -R u+w,go-w,a+rX-st $PKG - - # Create symlinks - make texlinks DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la -cd .. +# Remove all files which are covered by tlnet +rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info + +# install the tlnet stuff +mkdir -p $PKG/usr/share +tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1 +chown -R root:root $PKG +chmod -R u+w,go-w,a+rX-st $PKG + +# use symlinks/scripts from tlnet +mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin +rmdir $PKG/usr/share/texmf-dist/linked_scripts # set some paths sed -i \ -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \ -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \ -e 's|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|' \ - -e 's|texlive20[0-9][0-9]|texlive|g' \ $PKG/usr/share/texmf-dist/web2c/texmf.cnf # disable obsolete aleph/lamed/cslatex/pdfcslatex @@ -192,7 +196,6 @@ sed -i \ sed -i \ -e 's|selfautoparent:|/usr/share/|g' \ -e 's|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1"/usr/share/texmf-local"|' \ - -e 's|texlive20[0-9][0-9]|texlive|g' \ -e '/selfautodir/d' \ -e '/texmflocal/d' \ $PKG/usr/share/texmf-dist/web2c/texmfcnf.lua |