From 1ea4ac375b551afcb8ca8f9de495608b28fb5683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
Date: Tue, 13 Dec 2011 14:53:38 +0100
Subject: Update texlive-bin-libre and fix issues 264 and 300.

---
 libre/texlive-bin-libre/PKGBUILD | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'libre/texlive-bin-libre')

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 76c2de5e4..8ca94ddab 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,15 +5,15 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=4
+pkgrel=5
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
 makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19')
+conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.2')
 replaces=('texlive-bin')
 options=('!libtool')
 url='http://tug.org/texlive/'
@@ -52,8 +52,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147'
 build() {
    cd $srcdir
    # Remove bundled packages available in Parabola or not needed.
-   # TODO remove also icu
-   rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog}
+   rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog}
    rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler}
    # Building LuaTeX
    # cd luatex-beta-${_luatex_ver}
@@ -71,7 +70,7 @@ build() {
     --disable-ptex \
     --enable-luatex  \
     --without-system-ptexenc \
-    --with-system-graphite \
+    --without-system-graphite \
     --without-system-icu \
     --without-system-kpathsea \
     --with-system-freetype2 \
@@ -99,6 +98,8 @@ build() {
    cd "$srcdir"
    # this patch removes spurious error message with locale "xx_YY.utf8"
    patch -p0 -i fix-fontforge-encoding.patch
+   # 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
@@ -134,7 +135,7 @@ build() {
      --with-system-poppler \
      --with-system-xpdf \
      --with-system-freetype2 \
-     --with-system-graphite \
+     --without-system-graphite \
      --with-system-icu \
      --with-freetype2-libdir=/usr/lib \
      --with-freetype2-include=/usr/include/freetype2 \
@@ -222,6 +223,8 @@ package() {
    # clean updmap.cfg
    sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
    sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
+   # Don't list formats which need removed packages to work.
+   sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf
 
    #############################################################
    ### install
-- 
cgit v1.2.3-2-g168b