diff options
| -rw-r--r-- | office/texlive/doinst.sh | 2 | ||||
| -rw-r--r-- | office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff | 12 | ||||
| -rw-r--r-- | office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff | 11 | ||||
| -rw-r--r-- | office/texlive/texlive.SlackBuild | 8 |
4 files changed, 31 insertions, 2 deletions
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh index 5d68eafc83..22da4eb4c2 100644 --- a/office/texlive/doinst.sh +++ b/office/texlive/doinst.sh @@ -8,7 +8,7 @@ chroot . /usr/share/texmf/bin/mktexlsr 1>/dev/null 2>/dev/null # This is to generate /usr/share/texmf-var/ stuff chroot . /usr/share/texmf/bin/updmap-sys --nohash --syncwithtrees 1>/dev/null 2>/dev/null -chroot . /usr/share/texmf/bin/mktexlsr /usr/share/texmf-var 1>/dev/null 2>/dev/null +chroot . /usr/share/texmf/bin/mktexlsr 1>/dev/null 2>/dev/null chroot . /usr/share/texmf/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null # Just in case... diff --git a/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff new file mode 100644 index 0000000000..41c5b89fd2 --- /dev/null +++ b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff @@ -0,0 +1,12 @@ +diff -Nur texlive-20100722-source.orig//texk/kpathsea/texmf.cnf texlive-20100722-source/texk/kpathsea/texmf.cnf +--- texlive-20100722-source.orig//texk/kpathsea/texmf.cnf 2010-05-30 16:52:39.000000000 -0500 ++++ texlive-20100722-source/texk/kpathsea/texmf.cnf 2011-01-24 14:38:46.317199461 -0600 +@@ -61,7 +61,7 @@ + % A place for local additions to a "standard" texmf tree. + % This tree is not used for local configuration maintained by + % texconfig, it uses TEXMFCONFIG below. +-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local ++TEXMFLOCAL = $SELFAUTOPARENT/texmf-local + + % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. + % With teTeX-3.0 or later, this must be set. diff --git a/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff new file mode 100644 index 0000000000..fa064e7651 --- /dev/null +++ b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff @@ -0,0 +1,11 @@ +--- texlive-20100722-texmf.orig/texmf/web2c/texmf.cnf 2011-01-24 18:04:35.406411913 -0600 ++++ texlive-20100722-texmf/texmf/web2c/texmf.cnf 2011-01-24 18:04:45.709266445 -0600 +@@ -61,7 +61,7 @@ + % A place for local additions to a "standard" texmf tree. + % This tree is not used for local configuration maintained by + % texconfig, it uses TEXMFCONFIG below. +-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local ++TEXMFLOCAL = $SELFAUTOPARENT/texmf-local + + % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. + % With teTeX-3.0 or later, this must be set. diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild index a7d27661be..799b77f719 100644 --- a/office/texlive/texlive.SlackBuild +++ b/office/texlive/texlive.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=texlive VERSION=20100722 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SOURCE_VERS=$VERSION @@ -79,6 +79,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to Peter Berntsen for the problem report and fix +patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff + # etex is something for eclipse # Building with --disable-xindy as it requires libffcall # "kpsewhich -var-value=SELFAUTOPARENT" strips two trailing directories @@ -150,6 +153,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to Peter Berntsen for the problem report and fix +patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff + mkdir -p $PKG/usr/share/{texmf,texmf-dist} mv texmf-dist/* $PKG/usr/share/texmf-dist mv texmf/* $PKG/usr/share/texmf |