Wed Aug 22 23:44:25 UTC 201820180822234425

a/findutils-4.6.0-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20180821_1d17c18-noarch-1.txz:  Upgraded.
a/kernel-generic-4.14.66-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.66-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.66-x86_64-1.txz:  Upgraded.
ap/man-db-2.8.4-x86_64-2.txz:  Rebuilt.
  Rebuilt to get it on the slackpkg upgrade list since the previous texlive
  package clobbered /usr/bin/man and we need to fix that.
d/kernel-headers-4.14.66-x86-1.txz:  Upgraded.
k/kernel-source-4.14.66-noarch-1.txz:  Upgraded.
l/glib2-2.56.2-x86_64-1.txz:  Upgraded.
t/texlive-2018.180822-x86_64-1.txz:  Upgraded.
  Added some patches that I'd dropped - sorry, my bad.
  Don't clobber /usr/bin/man.
  Thanks to Johannes Schoepfer.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

5 files changed, 96 insertions, 51 deletions

diff --git a/source/t/texlive/doinst.sh b/source/t/texlive/doinst.sh
index f864e767d..d7af8f55c 100644
--- a/source/t/texlive/doinst.sh
+++ b/source/t/texlive/doinst.sh
@@ -1,5 +1,5 @@
 chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
 printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null
 chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
-chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
+chroot . /usr/bin/fmtutil-sys --missing 1>/dev/null 2>/dev/null
 chroot . /usr/bin/mtxrun --generate 1>/dev/null 2>/dev/null
diff --git a/source/t/texlive/patches/synctex-missing-header.patch b/source/t/texlive/patches/synctex-missing-header.patch
new file mode 100644
index 000000000..e783bd0bc
--- /dev/null
+++ b/source/t/texlive/patches/synctex-missing-header.patch
@@ -0,0 +1,18 @@
+--- texk/web2c/Makefile.in.orig	2018-07-23 11:03:30.763277046 +0200
++++ texk/web2c/Makefile.in	2018-07-23 11:04:53.940224054 +0200
+@@ -1762,6 +1762,7 @@
+ MANS = $(dist_man_MANS) $(nodist_man_MANS)
+ DATA = $(pkgconfig_DATA)
+ am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
++	synctexdir/synctex_version.h \
+ 	synctexdir/synctex_parser_utils.h
+ HEADERS = $(syncinclude_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+@@ -4021,6 +4022,7 @@
+ pkgconfigdir = ${libdir}/pkgconfig
+ @SYNCTEX_TRUE@syncinclude_HEADERS = \
+ @SYNCTEX_TRUE@	synctexdir/synctex_parser.h \
++@SYNCTEX_TRUE@	synctexdir/synctex_version.h \
+ @SYNCTEX_TRUE@	synctexdir/synctex_parser_utils.h
+ 
+ @SYNCTEX_TRUE@pkgconfig_DATA = synctexdir/synctex.pc
diff --git a/source/t/texlive/prep/texmf_get.sh b/source/t/texlive/prep/texmf_get.sh
index fab74ce5f..a6245823b 100755
--- a/source/t/texlive/prep/texmf_get.sh
+++ b/source/t/texlive/prep/texmf_get.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# texmf_get.sh (c) 2016-2018 Johannes Schoepfer, Germany, slackbuilds[at]schoepfer[dot]info
+# texmf_get.sh (c) 2016 - 2018 Johannes Schoepfer, Germany, slackbuilds[at]schoepfer[dot]info
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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 15.0.0
+#  V 15.0.2
 #
 #  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)
@@ -29,7 +29,7 @@
 # -base: the most usefull stuff, most binaries/scripts,
 #  manpages for compiled binaries  65mb 2017-11-07
 # -docs: -base documentation only, no manpages/GNU infofiles
-# -extra: remaining stuff
+# -extra: remaining stuff and corresponding docs
 #
 #  texlive netarchive policy: Every package is included as dependency 
 #  in exactly one collection. A package may have dependencies on other
@@ -39,46 +39,51 @@
 
 #set -e
 MAJORVERSION=2018
+mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
+TMP=$PWD/tmp
 
-# -excluded packages, which are
+# Globally excluded packages, which are/contain
 # -useless without tlmgr-installer
 # -non-linux
-# -covered by an external package e.g. asymptote on SBo
-# -obsolete
+# -covered by an external package, e.g. asymptote on SBo
+# -obsolete, e.g. omega
+# -java dependend packages
 # -binaries provided already by texlive.Slackbuild
-# -does only contain sources, or hyphen directives, e.g. metatype1, patch, ...
-# -does only contain hyphen directives, e.g. hyphen-farsi ...
+# -binaries provided already other system packages, e.g. texlive-scripts.ARCH
+# -only sources, or hyphen directives, e.g. metatype1, patch, ...
+# -only hyphen directives, e.g. hyphen-farsi ...
 
 global_exclude="
-  hyphen-farsi
-  hyphen-arabic
-  asymptote
-  tlcockpit
-  tlshell
-  texlive.infra
-  texlive-docindex
-  texlive-scripts
-  texlive-msg-translations
-  texosquery
-  texliveonfly
-  texworks
   aleph
-  omega
   antomega
-  omegaware
+  asymptote
+  bibtexu
+  cslatex
+  dviout.win32
+  hyphen-arabic
+  hyphen-farsi
   lambda
-  otibet
+  metatype1
   ocherokee
   oinuit
-  cslatex
-  bibarts
-  metatype1
+  omega
+  omegaware
+  otibet
   patch
+  texlive-common
+  texlive-docindex
+  texlive-msg-translations
+  texlive-scripts
+  texlive.infra
+  texliveonfly
+  texosquery
+  texworks
+  tlcockpit
+  tlshell
   wintools.win32
-  dviout.win32
   "
 
-  # special packages, move their type1 fonts(if metfonts are present)
+  # special packages, move their type1 fonts(if metafonts are present)
   # and/or docs to -extra
 special_packages="
   koma-script
@@ -423,11 +428,9 @@ untar () {
         fi
       fi
 
-      # Check for binaries, delete them as these should be provided
-      #  by texlive.Slackbuild, keep symlinks and scripts
+      # Delete binaries, these are provided
+      # by texlive.Slackbuild, keep symlinks and scripts
       
-      unset binaries
-      unset scripts
       for arch in $platforms
       do
         if [ -d $texmf/texmf-dist/bin/$arch ]
@@ -439,16 +442,19 @@ untar () {
           do
             ln -sf $(readlink $link | sed "s/^..\/..\(.*\)/..\/share\1/" ) $link || exit 1
           done
-          # move symlinks/scripts to linked_scripts
+          # move symlinks to linked_scripts
           find $texmf/texmf-dist/bin/$arch -type l -exec mv '{}' $texmf/texmf-dist/linked_scripts/ \; 
-        
-          binaries="$(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : )"
-          for bin in $binaries
+           
+          # keep only binaries of special packages
+          # remove xindy.mem(gzip compresses data) to prevent overwriting
+          for bin in $(find $texmf/texmf-dist/bin/$arch \
+            -type f -exec file '{}' + | \
+            grep -e "executable" -e "shared object" -e "gzip compressed data" | \
+            grep -e ELF -e "gzip compressed data" | cut -f 1 -d : )
           do
-            # keep binaries of special packages
             for binary in $keep_precompiled
             do
-              if [ "$(echo $bin | rev | cut -d'/' -f1 | rev )" != "$binary" ]
+              if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ]
               then
                 rm $bin
                 echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
@@ -723,12 +729,7 @@ exit 0
 
 # Main
 
-# release mirror
-mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
-# pre-test mirror 2016
-# mirror="http://ftp.cstug.cz/pub/tex/local/tlpretest/"
 LANG=C
-TMP=$PWD/tmp
 output=$TMP/packages
 output_doc=$TMP/packages.doc.tmp
 errorlog=$TMP/error.log
@@ -995,6 +996,26 @@ case $edition in
 Content of -$edition:
 $(sed "/-linux$/d" $packages_base | sort)
 EOF
+  # add texdoc cache file
+  if [ $(command -v texdoc) ]
+  then
+    mkdir -p $texmf/texmf-dist/tlpkg
+    mkdir -p texmf-dist/scripts/texdoc
+    ln -s ${db}.orig $texmf/texmf-dist/tlpkg/texlive.tlpdb
+    TEXMFVAR=$texmf/texmf-dist \
+      texdoc -lM texlive-en >/dev/null
+    mv texmf-dist/texdoc/cache-tlpdb.lua \
+      texmf-dist/scripts/texdoc/Data.tlpdb.lua
+    rm -rf $texmf/texmf-dist/tlpkg
+  else
+    echo "WARNING: texdoc/texlive is not installed, the texdoc cache"
+    echo "Data.tlpdb.lua can't be created and wont't be available."
+    echo "texdoc will not wotk without this."
+    echo ""
+    echo "Continue with any key or abort with ctrl-c"
+    read -n1
+  fi
+
 #Splitted packages, type1 fonts/docs moved to -extra:
 #$(echo $special_packages)
 #EOF
@@ -1003,6 +1024,7 @@ EOF
   tar rf $tarball --owner=0 --group=0 --sort=name \
     texmf-dist/doc/man/ texmf-dist/doc/info/ \
     texmf-dist/packages.$edition.gz \
+    texmf-dist/scripts/texdoc/Data.tlpdb.lua \
     || exit 1
 #  # add cm-super minimal maps/config
 #  tar rf $tarball --owner=0 --group=0 --sort=name \
diff --git a/source/t/texlive/slack-desc b/source/t/texlive/slack-desc
index d004be14c..2534a9e3a 100644
--- a/source/t/texlive/slack-desc
+++ b/source/t/texlive/slack-desc
@@ -2,18 +2,18 @@
 # The "handy ruler" below makes it easier to edit a package description.
 # Line up the first '|' above the ':' following the base package name, and
 # the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
+# You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 texlive: texlive (TeX binaries, support files, and formats)
 texlive:
 texlive: This package contains binaries, support files, TeX formats and
-texlive: packages, and other files from the TeXLive TeX distribution.
+texlive: packages, and other files included in the TeXLive TeX distribution.
 texlive: Included are input files for TeX, runtime configuration files,
 texlive: hyphenation tables, manpages, and the computer modern fonts.
 texlive:
 texlive: SlackBuilds.org has more texmf files and documentation in the
-texlive: texlive-extra, texlive-fonts, and texlive-docs packages.
+texlive: texlive-extra and texlive-docs packages.
 texlive:
 texlive:
diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild
index 47450b11e..b7a469c74 100755
--- a/source/t/texlive/texlive.SlackBuild
+++ b/source/t/texlive/texlive.SlackBuild
@@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=texlive
 SOURCEVERSION=${SOURCEVERSION:-20180414}
-VERSION=${VERSION:-2018.180820}
+VERSION=${VERSION:-2018.180822}
 BUILD=${BUILD:-1}
 
 TMP=${TMP:-/tmp}
@@ -97,11 +97,13 @@ sed -i \
   -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \
   texk/kpathsea/texmf.cnf
 
-# prevent compiling Xdvi with libXp
-sed -i 's|-lXp ||' texk/xdvik/configure
-
 # Upstream stable fixes
 patch -Np0 -i $CWD/patches/20180625.diff || exit 1
+# Add missing synctex header
+patch -Np0 -i $CWD/patches/synctex-missing-header.patch || exit 1
+
+# prevent compiling Xdvi with libXp
+sed -i 's|-lXp ||' texk/xdvik/configure
 
 # 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
@@ -129,6 +131,9 @@ cd build
     --disable-missing \
     --disable-multiplatform \
     --disable-debug \
+    --disable-dialog \
+    --disable-bibtexu \
+    --disable-xz \
     --with-x \
     --enable-xindy \
     --disable-xindy-docs \