diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-19 10:18:40 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-19 10:18:40 +0100 |
| commit | 855edb52bd8eb32bb11173a398fa09c1341dc165 (patch) | |
| tree | 69cff40a41a26d50c223a3f3e6f124aa77f84aab /extra/poppler | |
| parent | 1e538deedf51f262df84448dc04f23a669e43542 (diff) | |
| parent | ba105c9a82cf668f973a140c1792a3c02589980d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
extra/gdm/PKGBUILD
extra/libgnome/PKGBUILD
extra/maxima/PKGBUILD
extra/poppler/PKGBUILD
Diffstat (limited to 'extra/poppler')
| -rw-r--r-- | extra/poppler/PKGBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 2f3ac9fce..102a86acd 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177916 2013-02-10 18:36:01Z andyrtr $ +# $Id: PKGBUILD 178227 2013-02-18 14:46:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.1 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') @@ -42,7 +42,8 @@ check() { package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms') + optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" |