summaryrefslogtreecommitdiff
path: root/office/texlive
diff options
context:
space:
mode:
authorJohannes Schoepfer <slackbuilds[at]schoepfer[dot]info>2016-12-08 01:28:12 +0000
committerDavid Spencer <idlemoor@slackbuilds.org>2016-12-10 00:57:38 +0000
commit6c04c1b6b10c6eb963fffcedae0bea6c9932c2b7 (patch)
tree8f2d08d7ce81e0f2419a81981069b75b32d48ab8 /office/texlive
parent5d64e436c0040a779d66ab44a1e60cdb77f16903 (diff)
downloadslackbuilds-6c04c1b6b10c6eb963fffcedae0bea6c9932c2b7.tar.gz
office/texlive: Script cleanups & fixes, build bump.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'office/texlive')
-rw-r--r--office/texlive/doinst.sh3
-rw-r--r--office/texlive/patches/tex4ht.patch13
-rw-r--r--office/texlive/texlive.SlackBuild51
-rw-r--r--office/texlive/texlive.info2
4 files changed, 25 insertions, 44 deletions
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
index 8b880a349f..91d48effca 100644
--- a/office/texlive/doinst.sh
+++ b/office/texlive/doinst.sh
@@ -1,7 +1,4 @@
rm -f usr/share/texmf-config/web2c/updmap.cfg
chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
printf "y\n" | chroot . /usr/bin/updmap-sys --nohash --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/mtxrun --generate 1>/dev/null 2>/dev/null
-
diff --git a/office/texlive/patches/tex4ht.patch b/office/texlive/patches/tex4ht.patch
deleted file mode 100644
index 7ee2ff4e35..0000000000
--- a/office/texlive/patches/tex4ht.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index e2d8141cc0..5028a03de3 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -30,7 +30,7 @@
PRGNAM=texlive
SOURCEVERSION=20160523
VERSION=${VERSION:-2016.161031}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -73,7 +73,10 @@ export PATH="$PKG/usr/bin:$PATH"
export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
# set TEXMFROOT and TEXMFLOCAL
-sed -i "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" texk/kpathsea/texmf.cnf
+sed -i \
+ -e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \
+ -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \
+ texk/kpathsea/texmf.cnf
# Fix a segfault in upmendex, thanks to the lfs-folks.
patch -Np1 -i $CWD/patches/texlive-20160523b-source-upstream_fixes-1.patch
@@ -139,11 +142,28 @@ case $ARCH in
esac
rm -rf $PKG/usr/share/texmf-dist/bin
-# set TEXMFROOT and TEXMFLOCAL
+# Remove mpost from shell_escape_commands, http://tug.org/pipermail/tldistro/2016q4/000277.html
sed -i \
- "s|^TEXMFROOT.*|TEXMFROOT = \$SELFAUTODIR/share|;s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
+ -e '/^mpost/d' \
$PKG/usr/share/texmf-dist/web2c/texmf.cnf
+# 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
+
+# make ConTeXt work, and remove unused settings
+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
+
# Install the docs while we're still here
mkdir -p $PKG/usr/doc/texlive-$VERSION
cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
@@ -163,29 +183,6 @@ mkdir -p $PKG/usr/share/{texmf-config,texmf-var,texmf-local}
mkdir -p $PKG/usr/share/perl5
mv texk/tests/TeXLive $PKG/usr/share/perl5/
-mkdir -p $PKG/etc/profile.d
-cat << 'EOF' > $PKG/etc/profile.d/setuptex.sh
-#!/bin/sh
-
-# set environment for ConTeXt
-
-export TEXMF=/usr/share/texmf-dist
-export TEXMFCACHE=~/.texmf-cache
-export OSFONTDIR=~/.fonts:/usr/share/fonts
-unset TEXINPUTS MPINPUTS MFINPUTS
-EOF
-cat << 'EOF' > $PKG/etc/profile.d/setuptex.csh
-#!/bin/csh
-
-# set environment for ConTeXt
-
-setenv TEXMF /usr/share/texmf-dist
-setenv TEXMFCACHE ~/.texmf-cache
-setenv OSFONTDIR ~/.fonts:/usr/share/fonts
-unsetenv TEXINPUTS MPINPUTS MFINPUTS
-EOF
-chmod 755 $PKG/etc/profile.d/setuptex.*
-
# Handle the man pages
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 9014552857..85c343d29d 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -4,7 +4,7 @@ HOMEPAGE="http://tug.org/texlive/"
DOWNLOAD="http://mirrors.ctan.org/systems/texlive/Source/texlive-20160523b-source.tar.xz \
http://slackware.schoepfer.info/slackbuilds/texlive/2016/texlive/texlive-base-2016.161031.tar.xz"
MD5SUM="1e75db3412b3e2945fa94b0a423a29c7 \
- 2314d315b70a5f4dcc03eeb45db0be14"
+ 2314d315b70a5f4dcc03eeb45db0be14"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""