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

[Felix Yan]

    Date: Tuesday, August 11, 2020 @ 09:31:58
  Author: felixonmars
Revision: 674445

upgpkg: pandoc 2.10-1: rebuild with jira-wiki-markup 1.3.2, pandoc 2.10, pandoc-crossref, 0.3.7.0, pandoc-types 1.21

Modified:
  pandoc/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-11 09:31:53 UTC (rev 674444)
+++ PKGBUILD	2020-08-11 09:31:58 UTC (rev 674445)
@@ -2,16 +2,16 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=pandoc
-pkgver=2.9.2.1
-pkgrel=120
+pkgver=2.10
+pkgrel=1
 pkgdesc='Conversion between markup formats'
 url='https://pandoc.org'
 license=('GPL')
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-http' 'haskell-juicypixels' 'haskell-sha' 'haskell-aeson'
-         'haskell-aeson-pretty' 'haskell-attoparsec'
-         'haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup'
-         'haskell-case-insensitive' 'haskell-cmark-gfm' 'haskell-data-default' 'haskell-doclayout'
+         'haskell-aeson-pretty' 'haskell-attoparsec' 'haskell-base64-bytestring'
+         'haskell-blaze-html' 'haskell-blaze-markup' 'haskell-case-insensitive' 'haskell-cmark-gfm'
+         'haskell-connection' 'haskell-data-default' 'haskell-doclayout'
          'haskell-doctemplates' 'haskell-emojis' 'haskell-glob'
          'haskell-haddock-library' 'haskell-ipynb' 'haskell-jira-wiki-markup' 'haskell-skylighting'
          'haskell-skylighting-core' 'haskell-hslua' 'haskell-hslua-module-system'
@@ -20,7 +20,7 @@
          'haskell-texmath' 'haskell-network' 'haskell-pandoc-types' 'haskell-random'
          'haskell-scientific' 'haskell-tagsoup' 'haskell-temporary' 'haskell-text-conversions'
          'haskell-network-uri' 'haskell-unicode-transforms' 'haskell-unordered-containers'
-         'haskell-zip-archive' 'haskell-vector' 'haskell-xml' 'haskell-zlib')
+         'haskell-zip-archive' 'haskell-xml' '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')
@@ -29,18 +29,11 @@
 makedepends=('ghc' 'haskell-diff' 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-lua'
              'haskell-tasty-quickcheck' 'haskell-tasty-golden' 'haskell-quickcheck'
              'haskell-executable-path')
-source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        pandoc-revert-noprelude.patch::https://github.com/jgm/pandoc/commit/a9ef15bbd574bf09827c2c25ef1cd3efaf288f7c.patch
-        pandoc-skylighting-0.8.4.patch::https://github.com/jgm/pandoc/commit/46179d5b3e84b5c709e09924cbda524230ebd3fe.patch)
-sha512sums=('35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2'
-            'ca91b56003c02cd10cc9a073f63eac6e3d4371ebec80bb85500ea67e8aa0ac8938fb5487651ad72e6f964b9d5266c1578e649323e3390037fb87b443850eb4e1'
-            '3c057b1bb41cf2346e4fb63c50d3edb745eb598ef5d69c63bc0de0dcfa8e55fce0e4d19d5ce4872ca5fede10ee0f3621fb350d7e162fe63a8d0e1dea8b796e5b')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('1b8c1b2275ed0badcab5f55faf0afd68d1f2c692d261a0f5f2e5999b9254ebd64bb966e04f40974ff737d74a577f28ec808c2d537d1b8a7768b3e724ebfc3d76')
 
 prepare() {
     cd "${srcdir}/$pkgname-${pkgver}"
-    patch -p1 -i ../pandoc-revert-noprelude.patch
-    patch -p1 -i ../pandoc-skylighting-0.8.4.patch || :
-    sed -i 's/< 1.1/< 1.2/;s/< *2.14/<3/;s/< *1.3/<2/;s/< *1.5/<2/;s/< *0.7/<1/;s/< *1.2/<2/;s/< *1.9/<2/' $pkgname.cabal
 
     # TODO: find a better solution
     sed -i "s|let env' = dynlibEnv ++ |let env' = dynlibEnv ++ [(\"LD_LIBRARY_PATH\", \"$PWD/dist/build\")] ++ |" test/Tests/Command.hs