[arch-commits] Commit in texlive-bin/trunk (8 files)
Rémy Oudompheng
remy at archlinux.org
Tue Jun 20 06:04:34 UTC 2017
Date: Tuesday, June 20, 2017 @ 06:04:33
Author: remy
Revision: 299003
Update for TeXLive 2017 release.
Pacman hooks move to texlive-core package.
Added:
texlive-bin/trunk/luatex-gcc7.patch
Modified:
texlive-bin/trunk/PKGBUILD
Deleted:
texlive-bin/trunk/mktexlsr.hook
texlive-bin/trunk/mktexlsr.script
texlive-bin/trunk/texlive-fmtutil.hook
texlive-bin/trunk/texlive-fmtutil.script
texlive-bin/trunk/texlive-updmap.hook
texlive-bin/trunk/texlive-updmap.script
------------------------+
PKGBUILD | 76 +++++++++++++++++++++++++++--------------------
luatex-gcc7.patch | 32 +++++++++++++++++++
mktexlsr.hook | 16 ---------
mktexlsr.script | 12 -------
texlive-fmtutil.hook | 12 -------
texlive-fmtutil.script | 19 -----------
texlive-updmap.hook | 13 --------
texlive-updmap.script | 13 --------
8 files changed, 76 insertions(+), 117 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-20 06:03:09 UTC (rev 299002)
+++ PKGBUILD 2017-06-20 06:04:33 UTC (rev 299003)
@@ -3,8 +3,8 @@
# Contributor: francois <francois.archlinux.org>
pkgname=('texlive-bin' 'libsynctex')
-pkgver=2016.41290
-pkgrel=12
+pkgver=2017.44590
+pkgrel=1
license=('GPL')
arch=('i686' 'x86_64')
makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
@@ -12,32 +12,31 @@
'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
'perl' 'clisp' 'ffcall')
url='http://tug.org/texlive/'
-source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
- "mktexlsr.hook"
- "mktexlsr.script"
- "texlive-updmap.hook"
- "texlive-updmap.script"
- "texlive-fmtutil.hook"
- "texlive-fmtutil.script")
-md5sums=('7303361f2d441eb5c962a996fd77e8fa'
- 'a4e54f0cb05f401728b2b230fd63b300'
- '2bbbef810687f4b2804a4b8cb91ce02f'
- '0ecdbd88cae12dbeb5d0d63127c5fc38'
- 'c64d77b5111a26b9995263b49df4937c'
- '582af708588fd09eeaa0f08111e60091'
- '3f05fa08f84b94fcb3a76be271116a95')
+source=("http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
+ "luatex-gcc7.patch")
+sha256sums=('4645b4d55fc500ba9be7156a6a330afb44fbf7fda40dfd73fe9cb16d207f2038'
+ 'ee97f3e07e235dee4ad6d0c3e85c2260914c965e94d5ffbf481fa506df5f01ec')
+prepare() {
+ cd "$srcdir/source"
+
+ # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
+ sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
+
+ ## prevent compiling Xdvi with libXp
+ sed -i~ 's|-lXp ||' texk/xdvik/configure
+
+ # Luatex crashes when compiled with GCC7.1
+ patch -Np0 -i "${srcdir}/luatex-gcc7.patch"
+}
+
build() {
cd "$srcdir"
- # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
- sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
#############################################################
### configure
cd source
- ## prevent compiling Xdvi with libXp
- sed -i~ 's|-lXp ||' texk/xdvik/configure
- test ! -d Work && mkdir Work
+ mkdir -p Work
cd Work
echo "--> Initial configuration..."
# we use temporary prefix to avoid messing the existing
@@ -156,19 +155,13 @@
ln -s pdftex ${pkgdir}/usr/bin/xmltex
ln -s xetex ${pkgdir}/usr/bin/xelatex
- ## install pacman hooks
- install -D -m644 ${srcdir}/mktexlsr.hook "$pkgdir/usr/share/libalpm/hooks/mktexlsr.hook"
- install -D -m644 ${srcdir}/texlive-updmap.hook "$pkgdir/usr/share/libalpm/hooks/texlive-updmap.hook"
- install -D -m644 ${srcdir}/texlive-fmtutil.hook "$pkgdir/usr/share/libalpm/hooks/texlive-fmtutil.hook"
- install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr"
- install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap"
- install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil"
-
#############################################################
# remove dangling symlinks
_bibtexextra_scripts="
+bbl2bib
+bibdoiadd
bibexport
-bibdoiadd
+bibmradd
bibzbladd
listbib
ltx2crossrefxml
@@ -208,8 +201,17 @@
findhyph
fmtutil
fmtutil-sys
+fmtutil-user
fontinst
fragmaster
+ht
+htcontext
+htlatex
+htmex
+httex
+httexi
+htxelatex
+htxetex
installfont-tl
kpsepath
kpsetool
@@ -216,7 +218,9 @@
kpsewhere
kpsexpand
latex-git-log
+latex-papersize
latex2man
+latex2nemeth
latexdiff
latexdiff-vc
latexfileversion
@@ -230,9 +234,11 @@
lua2dox_filter
luaotfload-tool
luatools
+lwarpmk
make4ht
match_parens
mf2pt1
+mk4ht
mkjobtexmf
mkt1font
mktexfmt
@@ -253,6 +259,7 @@
pdfjam-slides3up
pdfjam-slides6up
pdfjoin
+pdflatexpicscale
pdfnup
pdfpun
pdfxup
@@ -287,16 +294,20 @@
texliveonfly
texloganalyser
texmfstart
+texosquery
+texosquery-jre5
+texosquery-jre8
thumbpdf
typeoutfileinfo
updmap
updmap-sys
+updmap-user
vpl2ovp
vpl2vpl
+xhlatex
xindy
"
_games_scripts="rubikrotation"
- _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
_humanities_scripts="diadia"
_langcyrillic_scripts="rubibtex rumakeindex"
_langextra_scripts="ebong"
@@ -305,6 +316,7 @@
kanji-fontmap-creator
kanji-config-updmap
kanji-config-updmap-sys
+kanji-config-updmap-user
"
_langkorean_scripts="jamo-normalize komkindex ttf2kotexfont"
_latexextra_scripts="
@@ -321,7 +333,7 @@
vpe
yplan"
_music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs
-m-tx musixtex musixflx pmx2pdf pmxchords"
+m-tx musixtex musixflx pmxchords"
_pictures_scripts="
cachepic
epspdf
Added: luatex-gcc7.patch
===================================================================
--- luatex-gcc7.patch (rev 0)
+++ luatex-gcc7.patch 2017-06-20 06:04:33 UTC (rev 299003)
@@ -0,0 +1,32 @@
+Author: Dr. Werner Fink <werner at suse.de>
+
+---
+ texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++
+ texk/web2c/luatexdir/luaffi/ffi.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+--- texk/web2c/luatexdir/luaffi/ctype.c
++++ texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000
+@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
+
+ lua_pop(L, 1); /* mt */
+ cd = (struct cdata*) lua_touserdata(L, idx);
++ if (!cd) {
++ lua_pushnil(L);
++ return NULL;
++ }
+ *ct = cd->type;
+ lua_getuservalue(L, idx);
+
+--- texk/web2c/luatexdir/luaffi/ffi.h
++++ texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000
+@@ -370,7 +370,7 @@ __declspec(align(16))
+ #endif
+ struct cdata {
+ const struct ctype type
+-#ifdef __GNUC__
++#if 0 /* def __GNUC__ */
+ __attribute__ ((aligned(16)))
+ #endif
+ ;
+
Deleted: mktexlsr.hook
===================================================================
--- mktexlsr.hook 2017-06-20 06:03:09 UTC (rev 299002)
+++ mktexlsr.hook 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,16 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/bin/mktexlsr
-Target = etc/texmf/*
-Target = usr/share/texmf/*
-Target = usr/share/texmf-dist/*
-Target = var/lib/texmf/*
-
-[Action]
-Description = Updating TeXLive filename database...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/mktexlsr
-
Deleted: mktexlsr.script
===================================================================
--- mktexlsr.script 2017-06-20 06:03:09 UTC (rev 299002)
+++ mktexlsr.script 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-/usr/bin/mktexlsr
-(cd /etc/texmf && /usr/bin/mtxrun --generate >/dev/null)
-# We need to remove directory "." from luatex cache to avoid absurd
-# behaviour.
-for item in /var/lib/texmf/luatex-cache/context/*/trees/*.lua; do
- if grep -F '["root"]="."' "$item" >/dev/null; then
- rm -f "$item" "${item%.lua}.luc"
- fi
-done
-
Deleted: texlive-fmtutil.hook
===================================================================
--- texlive-fmtutil.hook 2017-06-20 06:03:09 UTC (rev 299002)
+++ texlive-fmtutil.hook 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = var/lib/texmf/arch/installedpkgs/*.fmts
-
-[Action]
-Description = Updating TeXLive format files...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/texlive-fmtutil
-
Deleted: texlive-fmtutil.script
===================================================================
--- texlive-fmtutil.script 2017-06-20 06:03:09 UTC (rev 299002)
+++ texlive-fmtutil.script 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-FMTUTIL="etc/texmf/web2c/fmtutil.cnf"
-FMTUTILLOCAL="etc/texmf/web2c/fmtutil-local.cnf"
-
-cp usr/share/texmf-dist/web2c/fmtutil-hdr.cnf $FMTUTIL
-for file in var/lib/texmf/arch/installedpkgs/*.fmts; do
- echo >> $FMTUTIL
- echo "# $file" >> $FMTUTIL
- cat $file >> $FMTUTIL
-done
-if [[ -f "$FMTUTILLOCAL" ]]; then
- echo >> $FMTUTIL
- echo "# $FMTUTILLOCAL" >> $FMTUTIL
- cat "$FMTUTILLOCAL" >> $FMTUTIL
-fi
-
-/usr/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null
-
Deleted: texlive-updmap.hook
===================================================================
--- texlive-updmap.hook 2017-06-20 06:03:09 UTC (rev 299002)
+++ texlive-updmap.hook 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/bin/tex
-Target = var/lib/texmf/arch/installedpkgs/*.maps
-
-[Action]
-Description = Updating TeXLive font maps...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/texlive-updmap
-
Deleted: texlive-updmap.script
===================================================================
--- texlive-updmap.script 2017-06-20 06:03:09 UTC (rev 299002)
+++ texlive-updmap.script 2017-06-20 06:04:33 UTC (rev 299003)
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-UPDMAP="etc/texmf/web2c/updmap.cfg"
-UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
-
-cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-if [[ -f "$UPDMAPLOCAL" ]]; then
- cat "$UPDMAPLOCAL" >> $UPDMAP
-fi
-
-/usr/bin/updmap-sys --quiet --nohash
-
More information about the arch-commits
mailing list