[arch-commits] Commit in pandoc/trunk (PKGBUILD haddock-library-1.10.patch)

[Felix Yan]

    Date: Sunday, March 21, 2021 @ 22:23:05
  Author: felixonmars
Revision: 898549

upgpkg: pandoc 2.12-4: rebuild with haddock-library 1.10.0

Added:
  pandoc/trunk/haddock-library-1.10.patch
Modified:
  pandoc/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 ++++++++-----
 haddock-library-1.10.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 22:21:45 UTC (rev 898548)
+++ PKGBUILD	2021-03-21 22:23:05 UTC (rev 898549)
@@ -3,7 +3,7 @@
 
 pkgname=pandoc
 pkgver=2.12
-pkgrel=3
+pkgrel=4
 pkgdesc='Conversion between markup formats'
 url='https://pandoc.org'
 license=('GPL')
@@ -14,7 +14,7 @@
          'haskell-citeproc' 'haskell-commonmark' 'haskell-commonmark-extensions'
          'haskell-commonmark-pandoc' 'haskell-connection' 'haskell-data-default'
          'haskell-doclayout' 'haskell-doctemplates' 'haskell-emojis' 'haskell-file-embed'
-         'haskell-glob' 'haskell-haddock-library1.9' 'haskell-ipynb' 'haskell-jira-wiki-markup'
+         'haskell-glob' 'haskell-haddock-library' 'haskell-ipynb' 'haskell-jira-wiki-markup'
          'haskell-skylighting' 'haskell-skylighting-core' 'haskell-hslua'
          'haskell-hslua-module-path' 'haskell-hslua-module-system' 'haskell-hslua-module-text'
          'haskell-http-client' 'haskell-syb' 'haskell-hsyaml' 'haskell-http-client-tls'
@@ -31,12 +31,15 @@
 makedepends=('ghc' 'uusi' '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")
-sha512sums=('da57f8d9083d04bf2ec2f316f70b8241fcdeaeff6de7937f8f0803546109509527f39e1aa1ca576f966aaff3b563646f9f284b936802c37393311d9af5fa5144')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        haddock-library-1.10.patch)
+sha512sums=('da57f8d9083d04bf2ec2f316f70b8241fcdeaeff6de7937f8f0803546109509527f39e1aa1ca576f966aaff3b563646f9f284b936802c37393311d9af5fa5144'
+            'f6b0fc90d42e2a02c101e0ba3f86884cb957392b0a1d351f63459780df57a4db51bd9ef72230cd0060e5247fa9a0b5274701bb663163561a932e6aed4e0d5b07')
 
 prepare() {
     cd $pkgname-$pkgver
-    uusi -u random $pkgname.cabal
+    patch -p0 -i ../haddock-library-1.10.patch
+    uusi -u haddock-library -u random $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

Added: haddock-library-1.10.patch
===================================================================
--- haddock-library-1.10.patch	                        (rev 0)
+++ haddock-library-1.10.patch	2021-03-21 22:23:05 UTC (rev 898549)
@@ -0,0 +1,11 @@
+--- src/Text/Pandoc/Readers/Haddock.hs.orig	2021-03-22 06:09:57.716035128 +0800
++++ src/Text/Pandoc/Readers/Haddock.hs	2021-03-22 06:11:17.853110456 +0800
+@@ -128,7 +128,7 @@
+           DocIdentifier s -> B.codeWith ("",["haskell","identifier"],[]) $ T.pack s
+           _               -> mempty
+     DocIdentifierUnchecked s -> B.codeWith ("",["haskell","identifier"],[]) $ T.pack s
+-    DocModule s -> B.codeWith ("",["haskell","module"],[]) $ T.pack s
++    DocModule (H.ModLink s _) -> B.codeWith ("",["haskell","module"],[]) $ T.pack s
+     DocWarning _ -> mempty -- TODO
+     DocEmphasis d -> B.emph (docHToInlines isCode d)
+     DocMonospaced (DocString s) -> B.code $ T.pack s