Date: Sunday, May 30, 2021 @ 15:16:20 Author: felixonmars Revision: 950401
upgpkg: pandoc 2.14-1: rebuild with citeproc 0.4, commonmark 0.2, commonmark-extensions 0.2.1, commonmark-pandoc 0.2.1, jira-wiki-markup 1.4.0, pandoc 2.14 Modified: pandoc/trunk/PKGBUILD Deleted: pandoc/trunk/haddock-library-1.10.patch ----------------------------+ PKGBUILD | 16 ++++++---------- haddock-library-1.10.patch | 11 ----------- 2 files changed, 6 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-30 15:12:24 UTC (rev 950400) +++ PKGBUILD 2021-05-30 15:16:20 UTC (rev 950401) @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team <[email protected]> pkgname=pandoc -pkgver=2.13 -pkgrel=31 +pkgver=2.14 +pkgrel=1 pkgdesc='Conversion between markup formats' url='https://pandoc.org' license=('GPL') @@ -21,8 +21,8 @@ 'haskell-http-types' 'haskell-safe' 'haskell-split' '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-xml' 'haskell-xml-conduit' 'haskell-zlib') + 'haskell-unicode-collation' 'haskell-unicode-transforms' 'haskell-unordered-containers' + 'haskell-zip-archive' 'haskell-xml' 'haskell-xml-conduit' 'haskell-zlib') optdepends=('pandoc-crossref: for numbering figures, equations, tables and cross-references to them with pandoc-crossref filter' 'texlive-core: for pdf output') conflicts=('haskell-pandoc') @@ -29,15 +29,11 @@ replaces=('haskell-pandoc') makedepends=('ghc' 'uusi' 'haskell-diff' 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-lua' 'haskell-tasty-quickcheck' 'haskell-tasty-golden' 'haskell-quickcheck') -source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"; - haddock-library-1.10.patch) -sha512sums=('c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8' - 'f6b0fc90d42e2a02c101e0ba3f86884cb957392b0a1d351f63459780df57a4db51bd9ef72230cd0060e5247fa9a0b5274701bb663163561a932e6aed4e0d5b07') +source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";) +sha512sums=('ca763b3e1c64cc297f46492105353270dc71af1c8c27d874704749a9327954fe6ee1b4a1ca4029984f541a9e7438b84824f6eea3254c60021a3ae4b6a37bd2af') prepare() { cd $pkgname-$pkgver - patch -p0 -i ../haddock-library-1.10.patch - uusi -u attoparsec -u haddock-library -u random -u texmath $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 Deleted: haddock-library-1.10.patch =================================================================== --- haddock-library-1.10.patch 2021-05-30 15:12:24 UTC (rev 950400) +++ haddock-library-1.10.patch 2021-05-30 15:16:20 UTC (rev 950401) @@ -1,11 +0,0 @@ ---- 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
