[arch-commits] Commit in texlive-bin/trunk (PKGBUILD archlinux-build.patch texmf.cnf)
Rémy Oudompheng
remy at archlinux.org
Sun Dec 4 17:18:44 UTC 2011
Date: Sunday, December 4, 2011 @ 12:18:44
Author: remy
Revision: 144304
upgpkg: texlive-bin 2011.2-1
Texlive update.
Modified:
texlive-bin/trunk/PKGBUILD
texlive-bin/trunk/archlinux-build.patch
texlive-bin/trunk/texmf.cnf
-----------------------+
PKGBUILD | 26 +++++++++++-----
archlinux-build.patch | 58 +++++++++++++++++--------------------
texmf.cnf | 74 +++++++++++++++++++++++++++++++++++++++---------
3 files changed, 105 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-04 16:54:45 UTC (rev 144303)
+++ PKGBUILD 2011-12-04 17:18:44 UTC (rev 144304)
@@ -2,9 +2,9 @@
# Contributor: francois <francois.archlinux.org>
pkgname=texlive-bin
-pkgver=2011.1
+pkgver=2011.2
_luatex_ver=0.70.1
-pkgrel=5
+pkgrel=1
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
'archlinux-build.patch'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
+ 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111204.tar.xz'
+ 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111204.tar.xz'
# "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
)
@@ -39,12 +39,12 @@
etc/texmf/dvipdfm/config/config \
etc/texmf/xdvi/XDvi)
-md5sums=('ff30d6813babd2e41c414365eea9c147'
+md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'bfb9716aa00c86c08cd31e5b32edeb98'
'393a4bf67adc7ca5df2b386759d1a637'
- '94ef5571a54262790ab64d6d044dd10c'
- '58e8ab64188eaf15897b7acf472dca9f'
- '9f7ae1aa24afd9e34289ac10a8f9e87b'
+ 'ec009f1a1e5aee701ccc1dd0910db1c4'
+ '94c4a11fe6c6a152b6ccf1a3a64fae07'
+ '7da3ef4faed74dd2234708e1e7b82ce2'
'e7f0197559ef865d8c01683dab3b8526')
build() {
@@ -248,13 +248,18 @@
PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
#############################################################
# remove dangling symlinks
- _bibtexextra_scripts="bibexport"
+ _bibtexextra_scripts="
+bibexport
+urlbst
+"
_core_scripts="
afm2afm
arlatex
autoinst
bundledoc
cmap2enc
+ctanify
+ctanupload
de-macro
dviasm
epstopdf
@@ -268,6 +273,8 @@
latexmk
latexrevise
listings-ext.sh
+match_parens
+mf2pt1
mkjobtexmf
mkluatexfontdb
mkt1font
@@ -299,6 +306,7 @@
texdef
texdiff
texdirflatten
+texliveonfly
texloganalyser
thumbpdf
vpl2ovp
Modified: archlinux-build.patch
===================================================================
--- archlinux-build.patch 2011-12-04 16:54:45 UTC (rev 144303)
+++ archlinux-build.patch 2011-12-04 17:18:44 UTC (rev 144304)
@@ -1,21 +1,19 @@
-diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am
---- source.old/texk/am/script_links.am 2011-05-02 13:54:33.000000000 +0200
-+++ source/texk/am/script_links.am 2011-06-05 11:22:53.118216353 +0200
-@@ -51,8 +51,8 @@
- # We support both multiplatform and non-multiplatform builds.
+diff -aur source/texk/am/script_links.am source.new/texk/am/script_links.am
+--- source/texk/am/script_links.am 2011-09-29 14:17:38.000000000 +0200
++++ source.new/texk/am/script_links.am 2011-12-04 13:14:35.480368959 +0100
+@@ -52,7 +52,7 @@
+
+ # We support native builds, multiplatform or not, as well as distro builds.
install-links:
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- exit 1;; \
- esac
-diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am
---- source.old/texk/tetex/Makefile.am 2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/tetex/Makefile.am 2011-06-05 10:28:40.287025375 +0200
-@@ -35,7 +35,7 @@
+- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
++ @REL=$(datadir); \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+ exit 1; \
+diff -aur source/texk/tetex/Makefile.am source.new/texk/tetex/Makefile.am
+--- source/texk/tetex/Makefile.am 2011-09-29 14:14:07.000000000 +0200
++++ source.new/texk/tetex/Makefile.am 2011-12-04 13:13:32.089463768 +0100
+@@ -37,7 +37,7 @@
include $(srcdir)/../am/script_links.am
@@ -24,17 +22,15 @@
dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
if !WIN32
-diff -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am
---- source.old/texk/texlive/linked_scripts/Makefile.am 2011-05-31 11:47:04.000000000 +0200
-+++ source/texk/texlive/linked_scripts/Makefile.am 2011-06-05 09:41:50.997250443 +0200
-@@ -165,8 +165,8 @@
- done
- else !WIN32
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
-+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
- exit 1;; \
- esac
+diff -aur source/texk/texlive/linked_scripts/Makefile.am source.new/texk/texlive/linked_scripts/Makefile.am
+--- source/texk/texlive/linked_scripts/Makefile.am 2011-12-03 17:22:19.000000000 +0100
++++ source.new/texk/texlive/linked_scripts/Makefile.am 2011-12-04 13:14:20.550940820 +0100
+@@ -177,7 +177,7 @@
+ ## Name the link as the basename, removing any extension,
+ ## except for listings-ext.sh, which is documented as that name.
+ ## Downcase for the sake of TeXcount.pl -> texcount.
+- @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
++ @REL=$(datadir); \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked scripts' >&2; \
+ exit 1; \
Modified: texmf.cnf
===================================================================
--- texmf.cnf 2011-12-04 16:54:45 UTC (rev 144303)
+++ texmf.cnf 2011-12-04 17:18:44 UTC (rev 144304)
@@ -200,7 +200,25 @@
TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
+% Omega / Aleph.
+TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
+TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}//
+% p(La)TeX.
+TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
+TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
+
+% epTeX.
+TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
+
+% pBibTeX bibliographies and style files.
+BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib//
+BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst//
+
% ConTeXt.
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
@@ -285,6 +303,10 @@
MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
+% .ris and .bltxml bibliography formats.
+RISINPUTS = .;$TEXMF/bibtex/ris//
+BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
+
% MFT style files.
MFTINPUTS = .;$TEXMF/mft//
@@ -307,7 +329,7 @@
% TrueType outline fonts.
TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-% Opentype outline fonts.
+% OpenType outline fonts.
OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
% Type 42 outline fonts.
@@ -331,9 +353,6 @@
% Subfont definition files.
SFDFONTS = .;$TEXMF/fonts/sfd//
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
-
% OpenType feature files (.fea).
FONTFEATURES=.;$TEXMF/fonts/fea//
@@ -353,11 +372,13 @@
MIMELIBDIR = /etc
MAILCAPLIBDIR = /etc
-% Default settings for fontconfig library, used by Windows versions of
-% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this.
-FONTCONFIG_FILE=fonts.conf
-FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
+% Default settings for the fontconfig library as used by the Windows
+% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores
+% this. ConTeXT MkIV (all platforms) also use these values.
+%
+FONTCONFIG_FILE = fonts.conf
+FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
+FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
% TeX documentation and source files, for use with texdoc and kpsewhich.
TEXDOCS = $TEXMF/doc//
@@ -392,10 +413,19 @@
% would allow command execution.
DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-% Find scripts that are distributed/installed in the texmf tree.
-
% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
+%
+% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
+% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
+% default expansion of TEXINPUTS will not happen and .lua files under
+% the /tex/ will not be found.
+%
+% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
+% The default LUAINPUTS sufficess for luatex and dviluatex.
+%
+LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
% Lua needs to look for binary lua libraries distributed with packages.
CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
@@ -563,7 +593,8 @@
% interactive `e' option. %d is replaced by the line number and %s by
% the current filename. The default is specified at compile-time, and
% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d "%s"
+%TEXEDIT = vi +%d '%s' % default for Unix
+%TEXEDIT = texworks --position=+%d "%s" % default for Windows
%MFEDIT = ${TEXEDIT}
%MPEDIT = ${TEXEDIT}
@@ -571,6 +602,18 @@
% given as command line option or environment variable.
BIBTEX_CSFILE = 88591lat.csf
+% This variable is specific to Windows. It must be set to 0 or 1. The
+% default is 0. Setting it to 1 tells the Windows script wrappers to
+% use an already installed Perl interpreter if one is found on the
+% search path, in preference to the Perl shipped with TeX Live. Thus,
+% it may be useful if you both (a) installed a full Perl distribution
+% for general use, and (b) need to run Perl programs from TL that use
+% additional modules we don't provide. The TL Perl does provide all the
+% standard Perl modules.
+%
+%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
+
+
%
Part 3: Array and other sizes for TeX (and Metafont).
%
% If you want to change some of these sizes only for a certain TeX
@@ -644,6 +687,11 @@
save_size = 50000 % for saving values outside current group
stack_size = 5000 % simultaneous input sources
+% These are Omega-specific.
+ocp_buf_size = 500000 % character buffers for ocp filters.
+ocp_stack_size = 10000 % stacks for ocp computations.
+ocp_list_size = 1000 % control for multiple ocps.
+
% These work best if they are the same as the I/O buffer size, but it
% doesn't matter much. Must be a multiple of 8.
dvi_buf_size = 16384 % TeX
More information about the arch-commits
mailing list