diff options
| -rw-r--r-- | office/texlive/README | 8 | ||||
| -rw-r--r-- | office/texlive/patches/tex4ht.patch | 13 | ||||
| -rw-r--r-- | office/texlive/prep/texmf_get.sh | 33 | ||||
| -rw-r--r-- | office/texlive/slack-desc | 10 | ||||
| -rw-r--r-- | office/texlive/texlive.SlackBuild | 52 | ||||
| -rw-r--r-- | office/texlive/texlive.info | 12 |
6 files changed, 65 insertions, 63 deletions
diff --git a/office/texlive/README b/office/texlive/README index 8fa0699feb..672f8fd4b1 100644 --- a/office/texlive/README +++ b/office/texlive/README @@ -1,9 +1,9 @@ TeXLive (TeXLive binaries, support files, TeX formats) -This package contains all binaries (including xindy, asymptote, and biber) -and many support files, TeX formats and packages, and other files included -in the TeXLive TeX distribution. This should be adequate for the needs of -most TeX users. +This package contains binaries (including xindy and biber) and many +support files, TeX formats and packages, and other files included +in the TeXLive TeX distribution. This should be adequate for the +needs of most TeX users. The remaining stuff can be found in texlive-extra, texlive-fonts, and texlive-docs, all of which are also available at SlackBuilds.org. diff --git a/office/texlive/patches/tex4ht.patch b/office/texlive/patches/tex4ht.patch new file mode 100644 index 0000000000..7ee2ff4e35 --- /dev/null +++ b/office/texlive/patches/tex4ht.patch @@ -0,0 +1,13 @@ +--- texk/tex4htk/tex4ht.c.orig 2016-10-24 01:47:40.620666159 +0200 ++++ texk/tex4htk/tex4ht.c 2016-10-24 01:50:29.023550246 +0200 +@@ -6809,8 +6809,8 @@ + || + ((ch != + 2 +-) && (ch != +-5 ++) && (ch > ++10 + + )) + ) bad_dvi; diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh index 3d9d2fdd01..f005b9711f 100644 --- a/office/texlive/prep/texmf_get.sh +++ b/office/texlive/prep/texmf_get.sh @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# V 0.4 +# V 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) of collections and packages, @@ -85,7 +85,6 @@ packages () { was xypic xindy - asymptote barcodes qrcode lastpage @@ -101,6 +100,8 @@ packages () { titlesec csplain biblatex + biber.x86_64-linux + biber.i386-linux collection-langeuropean collection-langenglish collection-langfrench @@ -258,22 +259,13 @@ do # If $collection is a singel package, add it here if [ -n "$(head -n1 $tmpfile | fgrep -v "name collection" )" ] then - # Add only run packages (collection = package) - #if [ -z "$(grep -w "^${collection}$" $TMP/run.tlpkg)" ] - #if [ "$1" = docs ] - #then - # packagelist="$output_doc" - #else - packagelist="$TMP/run.tlpkg" - #fi + packagelist="$TMP/run.tlpkg" if [ -z "$(grep -w "^${collection}$" $packagelist)" ] then sed -i "/^$collection$/d" $collections_tobedone echo "$collection" >> $collections_done continue fi - # filter for max containersize to be added. - #[ $(grep ^containersize $tmpfile | cut -d' ' -f2 ) -lt $(($kb * 1024)) ] && echo "$collection" >> $output echo "$collection" >> $output fi # add dependend packages @@ -329,6 +321,8 @@ untar () { else tar vxf ${package}${flavour}.tar.xz --exclude tlpkg || exit 1 fi + # in case a binary package was decompressed, put it in texmf-dist + [ -d bin ] && cp -a bin texmf-dist && rm -rf bin if [ "$flavour" = ".doc" ] then size=$(( $(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2 ) / 1024 )) @@ -336,7 +330,6 @@ untar () { size=$(( $(grep ^containersize $texmf/$package.meta | cut -d' ' -f2 ) / 1024 )) fi shortdesc="$(grep ^shortdesc $texmf/$package.meta | cut -d' ' -f2- )" - #echo "$package: $shortdesc, Kb $size" >> $1.meta echo "$size Kb, $package: $shortdesc" >> $1.meta done < $1 # copy packages-list to texmf-dist, so included packages are known in later installation @@ -473,6 +466,12 @@ fi # Make a list of all packages available, but exclude binary and installer/configuration packages. # It turns out that packagenames without '.' are what we want. Packages with '.' are all binarie-packages, which we biuld from source. grep ^name $TMP/$db | grep -v ^"name collection-" | grep -v ^"name scheme-" | grep -v '\.' | cut -d' ' -f2 > $TMP/allpackages + +# add biber (perl)binaries as special exception. +cat << EOF >> $TMP/allpackages +biber.x86_64-linux +biber.i386-linux +EOF # further globaly excluded packages, which does not make sense without tlpkg-installer, or are non-linux specific, or are already covered by the sourcebuild. @@ -527,7 +526,7 @@ done # get linenumbers of empty lines [ -z "$emptylines" ] && emptylines="$(grep -n ^$ $TMP/$db | cut -d':' -f1)" -# sort doc- and run- packages out to avaoid binfiles and sourcfile in the texmf-tree +# sort doc- and run- packages out to avoid binfiles and sourcfile in the texmf-tree while read collection do if [ ! -s $texmf/$collection.meta ] @@ -542,6 +541,12 @@ do mv $tmpfile $texmf/$collection.meta fi done < $TMP/allpackages + +# handle biber binaries to be add-able +cat << EOF >> $TMP/run.tlpkg +biber.x86_64-linux +biber.i386-linux +EOF [ -f "$collections_done" ] && rm "$collections_done" diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc index 11e697b7d5..e80c9361a3 100644 --- a/office/texlive/slack-desc +++ b/office/texlive/slack-desc @@ -8,11 +8,11 @@ |-----handy-ruler------------------------------------------------------| texlive: TeXLive (TeXLive binaries, support files, TeX formats) texlive: -texlive: This package contains all binaries (including xindy, asymptote, and -texlive: biber), support files, TeX formats and packages, and other files -texlive: included in the TeXLive TeX distribution. Included are input files -texlive: for TeX, runtime configuration files, hyphenation tables, manpages, -texlive: and the computer modern fonts. +texlive: This package contains binaries (including xindy and biber), support +texlive: files, TeX formats and packages, and other files included in the +texlive: TeXLive TeX distribution. Included are input files for TeX, runtime +texlive: configuration files, hyphenation tables, manpages, and the computer +texlive: modern fonts. texlive: texlive: More texmf files can be found in the texlive-extra and texlive-fonts texlive: packages; all of the docs can be found in the texlive-docs package. diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild index 40b5e7c68f..6abd007618 100644 --- a/office/texlive/texlive.SlackBuild +++ b/office/texlive/texlive.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2009-2014 Robby Workman, Northport, AL, USA -# Copyright 2016 Johannes Schoepfer, Herrenberg, BW, Germany +# Copyright 2016 Johannes Schoepfer # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,8 +29,8 @@ PRGNAM=texlive VERSION=20160523 -TEXMF_VERS=20160622 -BUILD=${BUILD:-2} +TEXMF_VERS=20161023 +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -78,6 +78,11 @@ sed -i "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOC # Fix a segfault in upmendex, thanks to the lfs-folks. patch -Np1 -i $CWD/patches/texlive-20160523b-source-upstream_fixes-1.patch +# allow the tex4ht binary to process the updated xdv id byte in xetex +# for tl'2016 (i.e., 0.99996). Without this, htxelatex and the like +# simply bail out. +patch -p0 < $CWD/patches/tex4ht.patch + # --with-system-harfbuzz requires graphite2 (and harfbuzz linked to it) mkdir build ; cd build CFLAGS="$SLKCFLAGS" \ @@ -117,8 +122,8 @@ mkdir build ; cd build --with-system-ncurses \ --enable-gc=system \ --build=$ARCH-slackware-linux - make - # make check + make + # make check make install-strip DESTDIR=$PKG # Create symlinks make texlinks DESTDIR=$PKG @@ -130,30 +135,22 @@ mkdir -p $PKG/usr/share tar vxf $CWD/texlive-base-$TEXMF_VERS.tar.xz -C $PKG/usr/share chown -R root:root $PKG chmod -R u+w,go-w,a+rX-st $PKG +( +# Move biber binary to $PATH +cd $PKG/usr/share/texmf-dist +case $ARCH in + "x86_64") mv bin/x86_64-linux/biber $PKG/usr/bin ;; + "i586") mv bin/i386-linux/biber $PKG/usr/bin ;; +esac +rm -rf $PKG/usr/share/texmf-dist/bin +) + # set TEXMFROOT and TEXMFLOCAL sed -i \ "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \ $PKG/usr/share/texmf-dist/web2c/texmf.cnf -# Build asymptote; take support-files from the net-archives -cd utils/asymptote - CFLAGS="$SLKCFLAGS" \ - ./configure \ - --datarootdir=/usr/share/texmf-dist \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-gc=system \ - --with-latex=/usr/share/texmf-dist/tex/latex \ - --with-context=/usr/share/texmf-dist/tex/context/third \ - --build=$ARCH-slackware-linux - make - #make check - strip --strip-unneeded asy - install -m 755 asy $PKG/usr/bin/ -cd ../.. - # Remove context-stuff rm -rf $PKG/usr/share/texmf-dist/scripts/context @@ -176,15 +173,6 @@ cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION # Put a symlink to /usr/share/texmf-dist/doc in our Slackware docdir ln -s ../../share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/doc -# Install biber -if [ "$ARCH" = "x86_64" ]; then - tar vxf $CWD/biber.x86_64-linux.tar.xz bin/x86_64-linux/biber - mv bin/x86_64-linux/biber $PKG/usr/bin -elif [ "$ARCH" = "i586" ]; then - tar vxf $CWD/biber.i386-linux.tar.xz bin/i386-linux/biber - mv bin/i386-linux/biber $PKG/usr/bin -fi - # We won't make tlmgr easily available; it's still there, but # we'll make it harder to void the warranty :-) rm -f $PKG/usr/bin/tlmgr diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info index 08a96de07a..6784669f09 100644 --- a/office/texlive/texlive.info +++ b/office/texlive/texlive.info @@ -2,17 +2,13 @@ PRGNAM="texlive" VERSION="20160523" HOMEPAGE="http://tug.org/texlive/" DOWNLOAD="ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz \ - http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20160622.tar.xz \ - http://mirror.ctan.org/systems/texlive/tlnet/archive/biber.i386-linux.tar.xz" + http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20161023.tar.xz" MD5SUM="1e75db3412b3e2945fa94b0a423a29c7 \ - ef09a4006820fe7b2d592d957c47b8cc \ - 6c5a7a007c2c39e47bfac8f867d2dffe" + 1689161fb856c660ca833f02ef3bf0f7" DOWNLOAD_x86_64="ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz \ - http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20160622.tar.xz \ - http://mirror.ctan.org/systems/texlive/tlnet/archive/biber.x86_64-linux.tar.xz" + http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-20161023.tar.xz" MD5SUM_x86_64="1e75db3412b3e2945fa94b0a423a29c7 \ - ef09a4006820fe7b2d592d957c47b8cc \ - d20085dda2c940aec5d242f3faa03ad4" + 1689161fb856c660ca833f02ef3bf0f7" REQUIRES="" MAINTAINER="Johannes Schoepfer" EMAIL="slackbuilds[at]schoepfer[dot]info" |