[arch-commits] Commit in pandoc/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, October 19, 2015 @ 10:53:47
  Author: fyan
Revision: 144355

upgpkg: pandoc 1.15.1-1

Modified:
  pandoc/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-19 07:36:21 UTC (rev 144354)
+++ PKGBUILD	2015-10-19 08:53:47 UTC (rev 144355)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=pandoc
-pkgver=1.15.0.6
-pkgrel=3
+pkgver=1.15.1
+pkgrel=1
 pkgdesc="Conversion between markup formats"
 url="http://pandoc.org"
 license=("GPL")
@@ -23,17 +23,8 @@
 options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
-sha256sums=('d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46')
+sha256sums=('77503f8981cfcbe7df841ed1c71de9164d0eaf17b8b9c51e6d966e4fd333b733')
 
-prepare() {
-    # Allowed by upstream already
-    sed -e 's|http-types >= 0.8 && < 0.9|http-types >= 0.8 \&\& < 0.10|' \
-        -e 's|syb >= 0.1 && < 0.6|syb >= 0.1 \&\& < 0.7|' \
-        -e 's|aeson >= 0.7 && < 0.10|aeson >= 0.7 \&\& < 0.11|' \
-        -e 's|aeson >= 0.7.0.5 && < 0.10|aeson >= 0.7.0.5 \&\& < 0.11|' \
-        -i $pkgname-$pkgver/$pkgname.cabal
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     
@@ -42,7 +33,11 @@
         --libsubdir=\$compiler/site-local/\$pkgid \
             -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files
     runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
+
+    # LC_CTYPE=en_US.UTF-8 is needed since 1.15.1
+    # https://github.com/jgm/pandoc/issues/2457#issuecomment-149146107
+    LC_CTYPE=en_US.UTF-8 runhaskell Setup haddock --hoogle --html
+
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh