diff options
Diffstat (limited to '~fauno/pandoc')
| -rwxr-xr-x[-rw-r--r--] | ~fauno/pandoc/PKGBUILD | 23 | ||||
| -rwxr-xr-x[-rw-r--r--] | ~fauno/pandoc/SRCBUILD | 8 |
2 files changed, 18 insertions, 13 deletions
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index 56b9567f8..3d7d1fa9f 100644..100755 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -4,19 +4,20 @@ # Run `makepkg -srp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.9.3 -pkgrel=1 +pkgver=1.9.4.2 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') -options=('strip') -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig} SRCBUILD) -md5sums=('944f2b32803b0335345853cd2b1c1ad7' - '0ee3190fd7d43bcfebdb282ff12584f2' - 'ecc040d30c6e4fb77c32d598dd03729d') +options=(strip !makeflags !distcc) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) conflicts=('haskell-pandoc') +optdepends=('texlive-most: for pdf creation') +md5sums=('15f522c6bd0e26c709579b0a0fcfdcea' + 'e86da5aad2a7dfc6d53d2a2a0c562baa' + '415bbf263863c5cbc7c672ec1f497893') # PKGBUILD functions build() { @@ -27,7 +28,7 @@ build() { pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --prefix=${srcdir}/build/usr + cabal install --flags="embed_data_files" --prefix=${srcdir}/build/usr popd done @@ -35,7 +36,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library" + cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library embed_data_files" HOME=${srcdir}/${pkgname}-${pkgver} \ cabal build @@ -47,6 +48,10 @@ package() { runghc Setup.hs copy --destdir=${pkgdir}/ +# EC is unfree and makes Parabola TeXLive cry +# besides, it's unneeded + sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex + # runghc Setup.hs configure --prefix=DIR --bindir=DIR --libdir=DIR \ # --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \ # --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \ diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index 5ef2b9dc1..29c5f25ae 100644..100755 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -2,8 +2,8 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.9.3 -pkgrel=1 +pkgver=1.9.4.2 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -20,12 +20,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run ${pkgname}-${pkgver} | tail -n+3 > BUILDORDER + cabal install --dry-run file-embed ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER } package() { |