summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-09-18 12:59:31 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-09-18 12:59:31 -0300
commit4fe5a1594d68797b8cca926f05f359ed1685c59b (patch)
tree683bd857ff95745d14649f1cc4bec1d33bbe3cc3
parentfa5e7f3c0eca11b2b9ef6ed2c7f272b7fe7a2d23 (diff)
downloadabslibre-4fe5a1594d68797b8cca926f05f359ed1685c59b.tar.gz
abslibre-4fe5a1594d68797b8cca926f05f359ed1685c59b.tar.bz2
abslibre-4fe5a1594d68797b8cca926f05f359ed1685c59b.zip
pandoc 1.12
-rw-r--r--pcr/pandoc/PKGBUILD12
-rw-r--r--pcr/pandoc/SRCBUILD9
2 files changed, 9 insertions, 12 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 6fe28cc7c..0d2f2d8ea 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,13 +5,13 @@
pkgname=pandoc-static
_pkgname=pandoc
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.12
+pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
license=('GPL')
arch=('i686' 'x86_64')
-makedepends=('ghc' 'sh' 'cabal-install')
+makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
options=(strip !makeflags !distcc !emptydirs)
#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
@@ -20,9 +20,9 @@ source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.
replaces=('pandoc')
provides=('pandoc')
optdepends=('texlive-most: for pdf creation')
-md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
+md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
'SKIP'
- 'ee9d5924632ac07b5049be834a1ed054')
+ 'c2e9f9b880468455b6e6a7f9ba7308e8')
# PKGBUILD functions
build() {
@@ -47,7 +47,7 @@ build() {
case $_hkpkg in
$_pkgname-$pkgver)
HOME=${srcdir}/${_pkgname}-${pkgver} \
- cabal configure --flags='-library blaze_html_0_5' \
+ cabal configure --flags='-library' \
--prefix=/usr \
--libdir=${srcdir}/build/usr/lib -v
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index ec499f814..f822bb1a0 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,10 +2,7 @@
# Based on haskell-pandoc
pkgname=pandoc
-pkgver=1.11.1
-# 0.4 doesn't work with ghc 7.6
-# Use blaze_html_0_5 flag in the future
-_blaze_html=0.6.1.1
+pkgver=1.12
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
@@ -24,12 +21,12 @@ build() {
cabal --verbose=3 update
HOME=${srcdir}/${pkgname}-${pkgver} \
- cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${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 file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
+ cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
}
package() {