[arch-commits] Commit in texlive-bin/trunk (3 files)
Rémy Oudompheng
remy at archlinux.org
Wed Aug 13 23:38:09 UTC 2014
Date: Thursday, August 14, 2014 @ 01:38:09
Author: remy
Revision: 219723
upgpkg: texlive-bin 2014.34260-1
Upgraded biber to version 1.9
New lollipop command in /usr/bin
No more warning in install script (FS#36448)
Modified:
texlive-bin/trunk/PKGBUILD
texlive-bin/trunk/texlive.install
Deleted:
texlive-bin/trunk/poppler-0.26.patch
--------------------+
PKGBUILD | 53 +++++++++++++++----------
poppler-0.26.patch | 104 ---------------------------------------------------
texlive.install | 5 --
3 files changed, 34 insertions(+), 128 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-08-13 23:35:12 UTC (rev 219722)
+++ PKGBUILD 2014-08-13 23:38:09 UTC (rev 219723)
@@ -5,7 +5,7 @@
pkgname=texlive-bin
pkgver=2014.34260
pkgrel=1
-_biber_ver=1.8 # for biblatex 2.8 only.
+_biber_ver=1.9 # for biblatex 2.9 only.
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')
@@ -23,20 +23,19 @@
"http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
"http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/${_biber_ver}/binaries/Linux/biber-linux_x86_64.tar.gz"
"http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/${_biber_ver}/binaries/Linux/biber-linux_x86_32.tar.gz"
- poppler-0.26.patch
)
noextract=(biber-linux_x86_64.tar.gz
biber-linux_x86_32.tar.gz)
md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
- '0a8ffd5c0002a080a4202057b1f106c6'
- '64715ade77a7d659fd43be8773ebfdb9'
- '1011bee56611d55a1818a8698afdc6ed'
- '65f5eef04fdf65fe8ff2df873509c855')
+ 'b6fe9a6e6b3df0d69e804b87370039ef'
+ '137839688478710ded88909088dee970'
+ 'e1af258c7b7fa95d8299696aa3552eb3')
prepare() {
- cd source
- patch -Np2 -i ../poppler-0.26.patch
+ cd source
+ true
}
+
build() {
cd "$srcdir"
@@ -124,10 +123,8 @@
make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
- ## install Perl libraries
- mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
+ ## install biber
install -m755 "${srcdir}/biber" "${pkgdir}/usr/bin/biber"
- install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive"
## symlink engines by hand. texlinks has moved to texlive-core...
mkdir -p ${pkgdir}/usr/bin
@@ -136,6 +133,7 @@
ln -s luatex ${pkgdir}/usr/bin/dvilualatex
ln -s luatex ${pkgdir}/usr/bin/dviluatex
ln -s luatex ${pkgdir}/usr/bin/lualatex
+ ln -s luatex ${pkgdir}/usr/bin/lualollipop
ln -s pdftex ${pkgdir}/usr/bin/amstex
ln -s pdftex ${pkgdir}/usr/bin/cslatex
ln -s pdftex ${pkgdir}/usr/bin/csplain
@@ -143,6 +141,7 @@
ln -s pdftex ${pkgdir}/usr/bin/etex
ln -s pdftex ${pkgdir}/usr/bin/jadetex
ln -s pdftex ${pkgdir}/usr/bin/latex
+ ln -s pdftex ${pkgdir}/usr/bin/lollipop
ln -s pdftex ${pkgdir}/usr/bin/mex
ln -s pdftex ${pkgdir}/usr/bin/mllatex
ln -s pdftex ${pkgdir}/usr/bin/mltex
@@ -157,6 +156,7 @@
ln -s pdftex ${pkgdir}/usr/bin/utf8mex
ln -s pdftex ${pkgdir}/usr/bin/xmltex
ln -s xetex ${pkgdir}/usr/bin/xelatex
+ ln -s xetex ${pkgdir}/usr/bin/xelollipop
#############################################################
# remove dangling symlinks
@@ -181,10 +181,11 @@
checkcites
chkweb
context
+contextjit
ctanify
ctanupload
-ctxtools
de-macro
+depythontex
deweb
dosepsbin
dtxgen
@@ -203,15 +204,18 @@
kpsetool
kpsewhere
kpsexpand
+latex-git-log
latex2man
latexdiff
latexdiff-vc
latexfileversion
+latexindent
latexmk
latexpand
latexrevise
listings-ext.sh
ltxfileinfo
+ltximg
lua2dox_filter
luaotfload-tool
luatools
@@ -223,6 +227,7 @@
mktexfmt
mptopdf
mtxrun
+mtxrunjit
ot2kpx
pdf180
pdf270
@@ -244,8 +249,8 @@
ps2eps
ps2frag
pslatex
-pstopdf
purifyeps
+pythontex
repstopdf
rpdfcrop
rungs
@@ -261,6 +266,7 @@
texdoc
texdoctk
texexec
+texfot
texindy
texlinks
texliveonfly
@@ -274,15 +280,17 @@
vpl2vpl
xindy
"
+ _games_scripts="rubikrotation"
_htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
_langcyrillic_scripts="rubibtex rumakeindex"
- _langcjk_scripts="convbkmk ptex2pdf
+ _langextra_scripts="ebong"
+ _langgreek_scripts="mkgrkindex"
+ _langjapanese_scripts="convbkmk ptex2pdf
kanji-fontmap-creator
kanji-config-updmap
kanji-config-updmap-sys
"
- _langextra_scripts="ebong"
- _langgreek_scripts="mkgrkindex"
+ _langkorean_scripts="jamo-normalize komkindex ttf2kotexfont"
_latexextra_scripts="
authorindex
exceltex
@@ -293,18 +301,21 @@
splitindex
svn-multi
vpe"
- _music_scripts="m-tx musixtex musixflx pmx2pdf"
- _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
+ _music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs
+m-tx musixtex musixflx pmx2pdf pmxchords"
+ _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic mkpic"
_pstricks_scripts="pedigree pst2pdf"
_science_scripts="ulqda"
for s in \
${_bibtexextra_scripts} \
${_core_scripts} \
+ ${_games_scripts} \
${_htmlxml_scripts} \
- ${_langcjk_scripts} \
${_langcyrillic_scripts} \
- ${_langextra_scripts} \
- ${_langgreek_scripts} \
+ ${_langextra_scripts} \
+ ${_langgreek_scripts} \
+ ${_langjapanese_scripts} \
+ ${_langkorean_scripts} \
${_latexextra_scripts} \
${_music_scripts} \
${_pictures_scripts} \
Deleted: poppler-0.26.patch
===================================================================
--- poppler-0.26.patch 2014-08-13 23:35:12 UTC (rev 219722)
+++ poppler-0.26.patch 2014-08-13 23:38:09 UTC (rev 219723)
@@ -1,104 +0,0 @@
---- trunk/source/texk/web2c/luatexdir/image/epdf.h 2013/01/20 19:58:26 4559
-+++ trunk/source/texk/web2c/luatexdir/image/epdf.h 2014/01/02 15:35:31 4718
-@@ -40,21 +40,22 @@
- # include <goo/GooString.h>
- # include <goo/gmem.h>
- # include <goo/gfile.h>
--# include "Object.h"
--# include "Stream.h"
--# include "Gfx.h"
--# include "Annot.h"
--# include "Array.h"
--# include "Dict.h"
--# include "XRef.h"
--# include "Catalog.h"
--# include "Link.h"
--# include "Page.h"
--# include "GfxFont.h"
--# include "PDFDoc.h"
--# include "GlobalParams.h"
--# include "Error.h"
--# include "FileSpec.h"
-+# include <Object.h>
-+# include <Stream.h>
-+# include <Gfx.h>
-+# include <Annot.h>
-+# include <Array.h>
-+# include <Dict.h>
-+# include <XRef.h>
-+# include <Catalog.h>
-+# include <StructTreeRoot.h>
-+# include <Link.h>
-+# include <Page.h>
-+# include <GfxFont.h>
-+# include <PDFDoc.h>
-+# include <GlobalParams.h>
-+# include <Error.h>
-+# include <FileSpec.h>
-
- extern "C" {
-
-@@ -81,8 +82,8 @@
- # include "utils/avlstuff.h"
- # include "pdf/pdftypes.h"
-
--# include "lua52/lua.h"
--# include "lua52/lauxlib.h"
-+# include "lua.h"
-+# include "lauxlib.h"
-
- /* pdfgen.w */
- extern int ten_pow[10];
---- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013/04/05 10:54:08 4629
-+++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014/01/02 15:35:31 4718
-@@ -65,6 +65,7 @@
- #define M_PDFRectangle "PDFRectangle"
- #define M_Ref "Ref"
- #define M_Stream "Stream"
-+#define M_StructTreeRoot "StructTreeRoot"
- #define M_XRefEntry "XRefEntry"
- #define M_XRef "XRef"
-
-@@ -96,6 +97,7 @@
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
-
- //**********************************************************************
-@@ -573,7 +575,11 @@
-
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
-
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2146,14 +2152,22 @@
-
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- Object *obj;
-+#else
-+ StructTreeRoot *obj;
-+#endif
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- uout = new_Object_userdata(L);
-+#else
-+ uout = new_StructTreeRoot_userdata(L);
-+#endif
- uout->d = obj;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
Modified: texlive.install
===================================================================
--- texlive.install 2014-08-13 23:35:12 UTC (rev 219722)
+++ texlive.install 2014-08-13 23:38:09 UTC (rev 219723)
@@ -26,7 +26,8 @@
fi
_pacout=$(pacman -Q texlive-core 2>/dev/null)
read corename corever <<< ${_pacout}
- if [[ ${corever} == 2012* ]]; then
+ # only recreate formats if texlive-core has right version
+ if [[ ${corever} == 2014* ]]; then
if [[ -f usr/bin/fmtutil-sys ]]; then
echo -n "recreating all formats..."
usr/bin/fmtutil-sys --all 1>/dev/null
@@ -33,8 +34,6 @@
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
fi
- else
- echo "WARNING: not recreating formats since texlive-core has version '$corever'"
fi
[[ -x usr/bin/install-info ]] || return 0
for file in "${filelist[@]}"; do
More information about the arch-commits
mailing list