From 6e903c05f6545b9d9f750641c9d9b2ac97f02cc7 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Tue, 8 Nov 2011 12:47:44 +0100
Subject: texlive-bin-libre-2011.1-3 for poppler update.

---
 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 cc77a04c3..b43796397 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=2
+pkgrel=3
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall')
+makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam')
+conflicts=('pdfjam' 'texlive-bin')
 replaces=('texlive-bin')
 options=('!libtool')
 url='http://tug.org/texlive/'
@@ -24,7 +24,8 @@ source=('texmf.cnf'
         '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://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
+        # "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'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
   etc/texmf/chktex/chktexrc \
@@ -46,7 +47,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147'
          '94ef5571a54262790ab64d6d044dd10c'
          '58e8ab64188eaf15897b7acf472dca9f'
          '9f7ae1aa24afd9e34289ac10a8f9e87b'
-         'c9348d4381170204b1a1b0440d8b6918')
+         'e7f0197559ef865d8c01683dab3b8526')
 
 build() {
    cd $srcdir
@@ -55,7 +56,8 @@ build() {
    rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog}
    rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler}
    # Building LuaTeX
-   cd luatex-beta-${_luatex_ver}
+   # cd luatex-beta-${_luatex_ver}
+   cd luatex
    patch -p0 -i ../fix-fontforge-encoding.patch
   (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
    mkdir build
@@ -73,6 +75,7 @@ build() {
     --without-system-icu \
     --without-system-kpathsea \
     --with-system-freetype2 \
+    --with-system-xpdf \
     --with-system-poppler \
     --with-freetype2-libdir=/usr/lib \
     --with-freetype2-include=/usr/include/freetype2 \
@@ -234,7 +237,7 @@ package() {
    rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
 
    ## install luatex binary
-   cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c
+   cd $srcdir/luatex/build/texk/web2c
    ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/
    cd $pkgdir/usr/bin
    /bin/ln -s luatex texlua
-- 
cgit v1.2.3