Merge branch 'master' of ssh://gparabola/srv/git/abslibre

8 files changed, 108 insertions, 96 deletions

diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644..100755
--- a/libre/texlive-bin-libre/09-texlive-fonts.conf
+++ b/libre/texlive-bin-libre/09-texlive-fonts.conf
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 31b440c9d..14ed8bdb1 100644..100755
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 159191 2012-05-17 14:36:30Z remy $
+# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-bin-libre
-pkgver=2011.3
-_luatex_ver=0.70.1
-pkgrel=7
+pkgver=2012.0
+pkgrel=5
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -23,33 +22,31 @@ install="texlive.install"
 source=('texmf.cnf'
         'fix-fontforge-encoding.patch'
         '09-texlive-fonts.conf'
-        'luatex-poppler-0.20.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.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'
+        'poppler-0.20.patch'
+        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
+        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
+        'luatex-r4449-radical-rule-thickness.patch'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
-  etc/texmf/chktex/chktexrc \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/web2c/updmap.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
+    etc/texmf/chktex/chktexrc \
+	etc/texmf/dvipdfm/config/config \
+	etc/texmf/dvipdfmx/dvipdfmx.cfg \
+	etc/texmf/dvips/config/config.ps \
 	etc/texmf/tex/generic/config/language.dat \
 	etc/texmf/tex/generic/config/language.def \
 	etc/texmf/tex/generic/config/pdftexconfig.tex \
 	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvipdfm/config/config \
+	etc/texmf/web2c/fmtutil.cnf \
+	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
 md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          'bfb9716aa00c86c08cd31e5b32edeb98'
          '393a4bf67adc7ca5df2b386759d1a637'
-         '52ce57c02e30a25036b6a3175c566b78'
-         'c7bb38c0ab30c2b64cf4cf83a736b35c'
-         '5d8f06a3683ce88a3c33e15f5ba6a858'
-         'e7f0197559ef865d8c01683dab3b8526')
+         'e3a664d5a7f0923f35060fe9d25d2573'
+         'ac2c3c3aa765581f8504e21a5edbfb9f'
+         'f315a860158cfc952c82a6d759961024'
+         '5190f3295eb9a604c5f17f5bd607299b')
 
 build() {
    if [ "${CARCH}" != "i686" ]; then
@@ -57,50 +54,14 @@ build() {
      export CXXFLAGS="${CXXFLAGS} -fPIC"
    fi
 
-   cd "$srcdir"
-   # Building LuaTeX
-   # cd luatex-beta-${_luatex_ver}
-   cd luatex
-   patch -p0 -i ../fix-fontforge-encoding.patch
-   patch -Np0 -i ../luatex-poppler-0.20.patch
-  (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
-   mkdir build
-   cd build
-   ../source/configure --prefix=/usr -C \
-     --disable-native-texlive-build \
-     --with-banner-add="/Parabola GNU/Linux-libre" \
-    --enable-cxx-runtime-hack \
-    --disable-all-pkgs \
-    --disable-dump-share \
-    --disable-ptex \
-    --enable-luatex  \
-    --without-system-ptexenc \
-    --without-system-graphite \
-    --without-system-icu \
-    --without-system-kpathsea \
-    --with-system-freetype2 \
-    --with-system-poppler \
-    --with-freetype2-libdir=/usr/lib \
-    --with-freetype2-include=/usr/include/freetype2 \
-    --with-system-gd \
-    --with-system-libpng \
-    --without-system-teckit \
-    --with-system-zlib \
-    --with-system-zziplib \
-    --with-system-t1lib \
-    --disable-shared \
-    --disable-largefile \
-    --disable-ipc \
-    --without-mf-x-toolkit \
-    --without-x
-   make
-   make -C libs/obsdcompat
-   make -C texk/kpathsea
-   make -C texk/web2c luatex
-
-   cd "$srcdir"
+    cd "$srcdir"
    # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -p0 -i fix-fontforge-encoding.patch
+   patch -Np0 -i fix-fontforge-encoding.patch
+   # fix build with poppler >= 0.20
+   patch -Np0 -i poppler-0.20.patch
+   # fix radical rule thickness regression in Luatex
+   # http://tex.stackexchange.com/q/61952/729
+   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
    # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
    sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################
@@ -127,22 +88,22 @@ build() {
      --disable-t1utils \
      --disable-bibtexu \
      --disable-xz \
-     --without-system-zlib \
-     --without-system-zziplib \
-     --without-system-pnglib \
+     --with-system-zlib \
+     --with-system-zziplib \
+     --with-system-pnglib \
      --with-system-ncurses \
      --with-system-t1lib \
-     --without-system-gd \
-     --without-system-poppler \
-     --without-system-xpdf \
-     --without-system-freetype2 \
+     --with-system-gd \
+     --with-system-poppler \
+     --with-system-xpdf \
+     --with-system-freetype2 \
      --without-system-graphite \
      --with-freetype2-libdir=/usr/lib \
      --with-freetype2-include=/usr/include/freetype2 \
      --with-xdvi-x-toolkit=xaw \
      --disable-dump-share \
      --disable-aleph \
-     --disable-luatex \
+     --enable-luatex \
      --with-clisp-runtime=default \
      --enable-xindy --disable-xindy-rules --disable-xindy-docs
    #############################################################
@@ -238,13 +199,6 @@ package() {
    ## remove aleph from fmtutil.cnf
    sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
 
-   ## install luatex binary
-   #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/
-   install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/
-   cd "$pkgdir"/usr/bin
-   /bin/ln -s luatex texlua
-   /bin/ln -s luatex texluac
-
    ## install Perl libraries
    mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
    install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
@@ -256,6 +210,7 @@ package() {
    # remove dangling symlinks
    _bibtexextra_scripts="
 bibexport
+listbib
 urlbst
 "
    _core_scripts="
@@ -263,6 +218,7 @@ afm2afm
 arlatex
 autoinst
 bundledoc
+checkcites
 cmap2enc
 ctanify
 ctanupload
@@ -277,6 +233,7 @@ installfont-tl
 latex2man
 latexdiff
 latexdiff-vc
+latexfileversion
 latexmk
 latexrevise
 listings-ext.sh
@@ -315,31 +272,35 @@ texdiff
 texdirflatten
 texliveonfly
 texloganalyser
+typeoutfileinfo
 thumbpdf
 vpl2ovp
 vpl2vpl
 "
    _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
+   _langcjk_scripts="convbkmk updmap-setup-kanji"
    _langextra_scripts="ebong"
    _langgreek_scripts="mkgrkindex"
-   _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
+   _latexextra_scripts="
+authorindex
+exceltex
+makeglossaries
+pdfannotextractor
+perltex
+ppower4
+ps4pdf
+splitindex
+svn-multi
 vpe"
-   _music_scripts="musixtex musixflx"
+   _music_scripts="m-tx musixtex musixflx pmx2pdf"
    _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
-   _pstricks_scripts="pst2pdf"
+   _pstricks_scripts="pedigree pst2pdf"
    _science_scripts="ulqda"
    for s in \
         ${_bibtexextra_scripts} \
         ${_core_scripts}       \
         ${_htmlxml_scripts}    \
+        ${_langcjk_scripts}    \
         ${_langextra_scripts}  \
         ${_langgreek_scripts}  \
         ${_latexextra_scripts} \
diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644..100755
--- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch
+++ b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
index 175824f3e..175824f3e 100644..100755
--- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch
+++ b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
new file mode 100755
index 000000000..f925a1a93
--- /dev/null
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
@@ -0,0 +1,23 @@
+Index: source/texk/web2c/luatexdir/tex/mlist.w
+===================================================================
+--- source/texk/web2c/luatexdir/tex/mlist.w	(revision 4448)
++++ source/texk/web2c/luatexdir/tex/mlist.w	(revision 4449)
+@@ -1798,7 +1798,17 @@
+         theta = fraction_rule(cur_style);
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);
+-        theta = height(y);
++	/* If |y| is a composite then set |theta| to the height of its top
++           character, else set it to the height of |y|. */
++        if (list_ptr(y) != null
++            && type(list_ptr(y)) == hlist_node
++            && list_ptr(list_ptr(y)) != null
++            && type(list_ptr(list_ptr(y))) == glyph_node) {     /* and it should be */
++            theta = char_height(font(list_ptr(list_ptr(y))),
++                           character(list_ptr(list_ptr(y))));
++        } else {
++            theta = height(y);
++        }
+     } else {
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
new file mode 100755
index 000000000..3bd8183ab
--- /dev/null
+++ b/libre/texlive-bin-libre/poppler-0.20.patch
@@ -0,0 +1,22 @@
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2011-10-06 06:14:20.000000000 +0000
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-17 11:30:26.327236883 +0000
+@@ -1433,7 +1433,7 @@
+ 
+ static int m_Object_getTypeName(lua_State * L)
+ {
+-    char *s;
++    const char *s;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig	2012-06-24 17:12:34.376329435 +0200
++++ source/texk/web2c/pdftexdir/pdftosrc.cc	2012-06-24 17:12:25.490003152 +0200
+@@ -134,7 +134,7 @@
+         exit(1);
+     }
+     if (extract_xref_table) {
+-        int size = xref->getSize();
++        int size = xref->getNumObjects();
+         int i;
+         for (i = 0; i < size; i++) {
+             if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index b85850123..06a40a3b3 100644..100755
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -16,13 +16,19 @@ post_install() {
 }
 
 post_upgrade() {
+  local corename corever _pacout
   echo    ">>> texlive: updating the filename database..."
   usr/bin/mktexlsr
-  echo -n   "recreating all formats..."
-  usr/bin/fmtutil-sys --all 1>/dev/null
-  echo      " done." 
-  echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-
+  _pacout=$(pacman -Q texlive-core 2>/dev/null)
+  read corename corever <<< ${_pacout}
+  if [[ ${corever} == 2012* ]]; then
+      echo -n   "recreating all formats..."
+      usr/bin/fmtutil-sys --all 1>/dev/null
+      echo      " done." 
+      echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+  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
     install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf
index 76975ee5c..76975ee5c 100644..100755
--- a/libre/texlive-bin-libre/texmf.cnf
+++ b/libre/texlive-bin-libre/texmf.cnf