From b32b8323849ba13ea2237a68142601a64cccab48 Mon Sep 17 00:00:00 2001
From: Peter Wang
Date: Wed, 24 Apr 2013 17:40:43 -0300
Subject: office/pandoc: Updated for version 1.11.1.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 office/pandoc/pandoc.SlackBuild | 7 ++++---
 office/pandoc/pandoc.info       | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'office')

diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild
index dccae617d0..c0853b106a 100644
--- a/office/pandoc/pandoc.SlackBuild
+++ b/office/pandoc/pandoc.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=pandoc
-VERSION=${VERSION:-1.9.4.2}
+VERSION=${VERSION:-1.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,12 +54,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# --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
+# the build directory is removed.  For now, we build a static executable.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 runghc Setup.hs configure \
    --prefix=/usr \
-   --enable-shared \
-   --enable-executable-dynamic \
    --libdir=/usr/lib$LIBDIRSUFFIX \
    --libsubdir=ghc-$GHC_VERSION/$PRGNAM-$VERSION \
    --docdir=/usr/doc/$PRGNAM-$VERSION
diff --git a/office/pandoc/pandoc.info b/office/pandoc/pandoc.info
index 9df2630e8f..16d0df43d1 100644
--- a/office/pandoc/pandoc.info
+++ b/office/pandoc/pandoc.info
@@ -1,10 +1,10 @@
 PRGNAM="pandoc"
-VERSION="1.9.4.2"
+VERSION="1.11.1"
 HOMEPAGE="http://johnmacfarlane.net/pandoc/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/pandoc/1.9.4.2/pandoc-1.9.4.2.tar.gz"
-MD5SUM="c099360947d0cbb90608ce2f6a217071"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/pandoc/1.11.1/pandoc-1.11.1.tar.gz"
+MD5SUM="e895b22745affba37c0ba5e6e6d0f17c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-HTTP haskell-base64-bytestring haskell-citeproc-hs haskell-highlighting-kate haskell-random haskell-tagsoup haskell-temporary haskell-texmath haskell-zip-archive"
+REQUIRES="haskell-base64-bytestring haskell-data-default haskell-random haskell-temporary haskell-zip-archive haskell-tagsoup haskell-citeproc-hs haskell-highlighting-kate haskell-texmath haskell-HTTP"
 MAINTAINER="Peter Wang"
 EMAIL="novalazy@gmail.com"
-- 
cgit v1.2.3