summaryrefslogtreecommitdiff
path: root/office/pandoc
diff options
context:
space:
mode:
Diffstat (limited to 'office/pandoc')
-rw-r--r--office/pandoc/pandoc.SlackBuild16
-rw-r--r--office/pandoc/pandoc.info8
2 files changed, 14 insertions, 10 deletions
diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild
index f4b41a92a7..d825d1cb23 100644
--- a/office/pandoc/pandoc.SlackBuild
+++ b/office/pandoc/pandoc.SlackBuild
@@ -6,7 +6,7 @@
# Public domain.
PRGNAM=pandoc
-VERSION=${VERSION:-1.13.2}
+VERSION=${VERSION:-1.17.0.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -52,10 +52,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Accept haskell-data-default 0.6 -- Arch does this, so it must be ok :p
+sed -i -e 's/data-default >= 0.4 \&\& < 0.6,/data-default >= 0.4 \&\& < 0.7,/' $PRGNAM.cabal
# --enable-executable-dynamic seems to only add the build directory to the
# rpath but not /usr/lib*/ghc-*/pandoc-*, so libHSpandoc cannot be loaded if
@@ -79,7 +82,8 @@ mkdir -p $PKG/$PKGCONFD
mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS CONTRIBUTING.md COPYING COPYRIGHT README \
+cp -a \
+ BUGS changelog CONTRIBUTING.md COPYING COPYRIGHT README \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/office/pandoc/pandoc.info b/office/pandoc/pandoc.info
index b601391811..9737b9c99d 100644
--- a/office/pandoc/pandoc.info
+++ b/office/pandoc/pandoc.info
@@ -1,10 +1,10 @@
PRGNAM="pandoc"
-VERSION="1.13.2"
+VERSION="1.17.0.3"
HOMEPAGE="http://johnmacfarlane.net/pandoc/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/pandoc/1.13.2/pandoc-1.13.2.tar.gz"
-MD5SUM="74eeee9e7478b69601f2dd565959a77d"
+DOWNLOAD="http://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz"
+MD5SUM="a4d9055e330ea4b573442442e7d411e4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-mtl haskell-network haskell-network-uri haskell-pandoc-types haskell-parsec haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-text haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib"
+REQUIRES="ghc haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-cmark haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-filemanip haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-mtl haskell-network haskell-network-uri haskell-pandoc-types haskell-parsec haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-text haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib"
MAINTAINER="Peter Wang"
EMAIL="novalazy@gmail.com"