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

[Felix Yan]

    Date: Monday, July 16, 2018 @ 12:45:42
  Author: felixonmars
Revision: 359844

upgpkg: pandoc 2.2.2-1

rebuild with pandoc 2.2.2, haddock-library 1.6.0

Modified:
  pandoc/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-16 12:37:19 UTC (rev 359843)
+++ PKGBUILD	2018-07-16 12:45:42 UTC (rev 359844)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=pandoc
-pkgver=2.2.1
-pkgrel=77
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="Conversion between markup formats"
 url="http://pandoc.org"
 license=("GPL")
@@ -14,12 +14,12 @@
          'haskell-blaze-html' 'haskell-blaze-markup' 'haskell-case-insensitive' 'haskell-cmark-gfm'
          'haskell-data-default' 'haskell-doctemplates' 'haskell-exceptions' 'haskell-glob'
          'haskell-haddock-library' 'haskell-skylighting' 'haskell-hslua'
-         'haskell-hslua-module-text' 'haskell-http-client' 'haskell-syb' 'haskell-http-client-tls'
+         'haskell-hslua-module-text' 'haskell-http-client' 'haskell-syb' 'haskell-hsyaml' 'haskell-http-client-tls'
          'haskell-http-types' 'haskell-safe' 'haskell-split' 'haskell-texmath'
          'haskell-network' 'haskell-pandoc-types' 'haskell-random'
-         'haskell-scientific' 'haskell-tagsoup' 'haskell-temporary' 'haskell-network-uri'
+         'haskell-tagsoup' 'haskell-temporary' 'haskell-network-uri'
          'haskell-unordered-containers' 'haskell-zip-archive' 'haskell-vector' 'haskell-xml'
-         'haskell-yaml' 'haskell-zlib')
+         'haskell-zlib')
 optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
             'pandoc-crossref: for numbering figures, equations, tables and cross-references to them with pandoc-crossref filter'
             'texlive-core: for pdf output')
@@ -27,18 +27,14 @@
 replaces=('haskell-pandoc')
 makedepends=('ghc' 'haskell-diff' 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck'
              'haskell-tasty-golden' 'haskell-quickcheck' 'haskell-executable-path')
-source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        https://github.com/jgm/pandoc/commit/edcfbccf5dbef7d64b498376b457cc0e44fd275c.patch)
-sha512sums=('84af51e180bcf8f0c11e67d8031d11a4b60c6061736a48c21e64bc30d0018a0161e3993167111584e384eced18632841b70027fdf29ed9e46427425096bb56b1'
-            '9e19d24d98a173622a00993c0a5b57f2a8e02f9c117572fa25863dba23fd25cd9d56ccddbf4213c608747c89b17f657f0f769c777d5c12dbb99532e3ab23dabe')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('a7ca05da1e469b6d133afbfb302a361662a389fc0be6c2a9017f3643436c7b95f475da7633f6edca664282aaf518115ad321d76c63cfaf2f8bd0d5188979f2c3')
 
 prepare() {
     cd "${srcdir}/$pkgname-${pkgver}"
-    patch -p1 -i ../edcfbccf5dbef7d64b498376b457cc0e44fd275c.patch
 
     # TODO: find a better solution
     sed -i "s|let env' = dynlibEnv ++ |let env' = dynlibEnv ++ [(\"LD_LIBRARY_PATH\", \"$PWD/dist/build\")] ++ |" test/Tests/Command.hs
-    sed -i -e 's/<.*1.1/<2/' -e 's/<.*0.9/<1/' -e 's/<.*3.3/<4/' $pkgname.cabal
 }
 
 build() {
@@ -47,7 +43,7 @@
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
         --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" --enable-tests \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
-            -fnetwork-uri -f-trypandoc -f-embed_data_files -f-static
+            -f-trypandoc -f-embed_data_files -f-static
     runhaskell Setup build
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script