diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-23 16:00:32 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-23 16:00:32 -0200 |
| commit | 511b27f93a5f01bbbb9c06fe2c9d64d21a1b66e9 (patch) | |
| tree | 7a4a0a75bed90edd08c671b3538c04661a77c5b3 /pcr/pandoc/PKGBUILD | |
| parent | 5f326c058e279bd2e1bdbf64d4e1df926ea29484 (diff) | |
| parent | 51abf13dfa1bdc99348e39a061a114e9abddad39 (diff) | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Diffstat (limited to 'pcr/pandoc/PKGBUILD')
| -rw-r--r-- | pcr/pandoc/PKGBUILD | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 94be42fea..4d3483c08 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -8,15 +8,15 @@ test -z "$LANG" && export LANG="en_US.utf8" pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12.4.2 +pkgver=1.13.1 pkgrel=1 -_srcrel=2 +_srcrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') # Needed for pandoc-citeproc -depends=('icu>=52' 'icu<=54') +depends=('icu<=55') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig} @@ -24,6 +24,9 @@ source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgv replaces=('pandoc') provides=('pandoc') optdepends=('texlive-most: for pdf creation') +md5sums=('c805827e4369bf5ba6ccff7164f03623' + 'SKIP' + '4c25acc06724a994d2ce52b069aab911') # PKGBUILD functions build() { @@ -33,11 +36,11 @@ build() { # pandoc-citeproc needs hsb2hs export PATH=${srcdir}/build/usr/bin:$PATH - while read _hkpkg; do + while read _hkpkg extra; do # Skip already built - [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue + [ -d "${srcdir}/build/usr/lib/i386-linux-ghc-7.8.3/$_hkpkg" ] && continue - pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null + pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null || continue msg2 "Building $_hkpkg" @@ -45,7 +48,8 @@ build() { $_pkgname-$pkgver) HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal configure --prefix=/usr \ - --libdir=${srcdir}/build/usr/lib -v + --flags='embed_data_files https' \ + --libdir=${srcdir}/build/usr/lib/i386-linux-ghc-7.8.3 -v HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal build @@ -57,7 +61,7 @@ build() { pandoc-citeproc*) HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \ - --libdir=${srcdir}/build/usr/lib \ + --libdir=${srcdir}/build/usr/lib/i386-linux-ghc-7.8.3 \ --prefix=/usr -v HOME=${srcdir}/${_pkgname}-${pkgver} \ |