summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/pandoc/PKGBUILD21
-rw-r--r--pcr/pandoc/SRCBUILD4
2 files changed, 12 insertions, 13 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 47c9788c9..74b1c77d9 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -4,7 +4,7 @@
# Run `makepkg -sp SRCBUILD` if you want to update the source tarball
pkgname=pandoc
-pkgver=1.10.0.4
+pkgver=1.10.1
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
@@ -13,10 +13,13 @@ arch=('i686' 'x86_64')
makedepends=('ghc' 'sh' 'cabal-install')
options=(strip !makeflags !distcc !emptydirs)
source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
- SRCBUILD
- citeproc-hs-pre-0.3.7.patch)
+ SRCBUILD)
+# citeproc-hs-pre-0.3.7.patch)
conflicts=('haskell-pandoc')
optdepends=('texlive-most: for pdf creation')
+md5sums=('bca5fa27ac593f24d18cd434289d4673'
+ '87a6a5fd1abfbe3199c5ff42742ff5f1'
+ '0d5b6d7adf6fdcea52dcbb7b62368b19')
# PKGBUILD functions
build() {
@@ -26,9 +29,9 @@ build() {
# Patches from the next citeproc-hs release
# These are needed because 0.3.6 with embed_data_files is broken
# darcs diff --from-tag=0.3.6
- pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
- patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
- popd
+# pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+# patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
+# popd
while read _hkpkg; do
# Skip already built
@@ -41,7 +44,7 @@ build() {
case $_hkpkg in
$pkgname-$pkgver)
HOME=${srcdir}/${pkgname}-${pkgver} \
- cabal configure --flags='-library' \
+ cabal configure --flags='-library blaze_html_0_5' \
--prefix=/usr \
--libdir=${srcdir}/build/usr/lib -v
@@ -87,7 +90,3 @@ package() {
install -d ${pkgdir}/usr/share
cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
}
-md5sums=('94c36d52ee6d7e33b16d75048f6617d3'
- '2958854a387ea0845720e9456f814845'
- 'd159a34656b7a1e13df5e6149b2f898b'
- 'd389fc323eeaced767cea53edcfc0127')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index c1cfbfa5c..4c7f5de8d 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
# Based on haskell-pandoc
pkgname=pandoc
-pkgver=1.10.0.4
+pkgver=1.10.1
# 0.4 doesn't work with ghc 7.6
# Use blaze_html_0_5 flag in the future
_blaze_html=0.5.1.3
@@ -29,7 +29,7 @@ build() {
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 --flags="blaze_html_0_5" --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
}
package() {