summaryrefslogtreecommitdiff
path: root/libre/texlive-bin-libre
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-15 11:36:24 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-15 11:36:24 -0300
commit7caeeae33fd491dbea5044168bbc50197963118c (patch)
tree2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /libre/texlive-bin-libre
parent2f39e56def6dadf0746b6e96e756518f1af9396b (diff)
parent3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/ginac/PKGBUILD community/gnash/PKGBUILD community/haskell-tar/PKGBUILD community/libdlna/PKGBUILD community/mplayer2/PKGBUILD community/musescore/PKGBUILD community/open-vm-tools-modules/PKGBUILD community/paraview/PKGBUILD community/picard/PKGBUILD core/idnkit/PKGBUILD core/ifenslave/PKGBUILD extra/audacious/PKGBUILD extra/avidemux/PKGBUILD extra/ffmpeg/PKGBUILD extra/graphite/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/k3b/PKGBUILD extra/kdemultimedia/PKGBUILD extra/koffice/PKGBUILD extra/kradio/PKGBUILD extra/libreoffice/PKGBUILD extra/mediastreamer/PKGBUILD extra/poppler/PKGBUILD extra/vlc/PKGBUILD libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'libre/texlive-bin-libre')
-rw-r--r--libre/texlive-bin-libre/PKGBUILD10
1 files changed, 5 insertions, 5 deletions
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index e6b7679cd..55cf77538 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -9,11 +9,11 @@ pkgrel=3
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18' 'libsigsegv' 'zziplib')
makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
optdepends=('ed: for texconfig')
provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam' 'texlive-bin')
+conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19')
replaces=('texlive-bin')
options=('!libtool')
url='http://tug.org/texlive/'
@@ -22,10 +22,10 @@ source=('texmf.cnf'
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
'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'
+ 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
+ 'ftp://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://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
+ 'ftp://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
)
backup=(etc/texmf/web2c/texmf.cnf \
etc/texmf/chktex/chktexrc \