summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorpho <pho@pkgsrc.org>2022-02-12 08:16:02 +0000
committerpho <pho@pkgsrc.org>2022-02-12 08:16:02 +0000
commit895d2cf90bf3c7efed64de45a0b6fdf49aa41b7c (patch)
treedb2dcc546b7259c67af3f94773c1904db26082b1 /converters
parentec5dbdfbec95920391dd2416d41be3fb72503c30 (diff)
downloadpkgsrc-895d2cf90bf3c7efed64de45a0b6fdf49aa41b7c.tar.gz
Update to pandoc-2.17.1.1
The list of changes since 2.13 is too long to paste here: https://hackage.haskell.org/package/pandoc-2.17.1.1/changelog
Diffstat (limited to 'converters')
-rw-r--r--converters/pandoc/Makefile26
-rw-r--r--converters/pandoc/PLIST112
-rw-r--r--converters/pandoc/buildlink3.mk12
-rw-r--r--converters/pandoc/distinfo12
-rw-r--r--converters/pandoc/patches/patch-pandoc.cabal25
-rw-r--r--converters/pandoc/patches/patch-src_Text_Pandoc_Options.hs31
-rw-r--r--converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Docx_Combine.hs30
-rw-r--r--converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Haddock.hs16
8 files changed, 92 insertions, 172 deletions
diff --git a/converters/pandoc/Makefile b/converters/pandoc/Makefile
index ecae09a13fb..e1776c4e7f8 100644
--- a/converters/pandoc/Makefile
+++ b/converters/pandoc/Makefile
@@ -1,28 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2022/01/18 02:48:02 pho Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/12 08:16:02 pho Exp $
-DISTNAME= pandoc-2.13
+DISTNAME= pandoc-2.17.1.1
PKGNAME= ${DISTNAME}
-PKGREVISION= 2
CATEGORIES= converters
MAINTAINER= zecrazytux@zecrazytux.net
COMMENT= Conversion between markup formats
LICENSE= gnu-gpl-v2
-# When -O2 is in effect, GHC 8.8.1 uses whopping 1 TiB of virtual
-# memory (what?) to compile src/Text/Pandoc/Writers/RST.hs for some
-# unknown reason, possibly related to
-# https://gitlab.haskell.org/ghc/ghc/issues/5642
+# When -O2 is in effect, GHC uses whopping 3.5 GiB of memory (what?) to
+# compile src/Text/Pandoc/Writers/RST.hs for some unknown reason, possibly
+# related to https://gitlab.haskell.org/ghc/ghc/issues/5642
HASKELL_OPTIMIZATION_LEVEL= 1
-# Parallelization is unsafe because of the extremely high memory
-# consumption even with -O1. It uses 7.5 GiB of virtual memory even
-# with no parallelism.
-MAKE_JOBS_SAFE= NO
-
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
post-install:
- ${INSTALL_MAN} ${WRKSRC}/man/pandoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_MAN} ${WRKSRC}/man/pandoc.1 \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../converters/hs-aeson/buildlink3.mk"
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
@@ -44,9 +38,11 @@ post-install:
.include "../../textproc/hs-Glob/buildlink3.mk"
.include "../../textproc/hs-haddock-library/buildlink3.mk"
.include "../../lang/hs-hslua/buildlink3.mk"
+.include "../../converters/hs-hslua-aeson/buildlink3.mk"
.include "../../sysutils/hs-hslua-module-path/buildlink3.mk"
.include "../../devel/hs-hslua-module-system/buildlink3.mk"
.include "../../textproc/hs-hslua-module-text/buildlink3.mk"
+.include "../../devel/hs-hslua-module-version/buildlink3.mk"
.include "../../textproc/hs-HsYAML/buildlink3.mk"
.include "../../www/hs-HTTP/buildlink3.mk"
.include "../../www/hs-http-client/buildlink3.mk"
@@ -55,9 +51,12 @@ post-install:
.include "../../devel/hs-ipynb/buildlink3.mk"
.include "../../textproc/hs-jira-wiki-markup/buildlink3.mk"
.include "../../graphics/hs-JuicyPixels/buildlink3.mk"
+.include "../../devel/hs-lpeg/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../net/hs-network-uri/buildlink3.mk"
+.include "../../devel/hs-pandoc-lua-marshal/buildlink3.mk"
.include "../../textproc/hs-pandoc-types/buildlink3.mk"
+.include "../../devel/hs-pretty-show/buildlink3.mk"
.include "../../devel/hs-random/buildlink3.mk"
.include "../../devel/hs-safe/buildlink3.mk"
.include "../../math/hs-scientific/buildlink3.mk"
@@ -74,6 +73,7 @@ post-install:
.include "../../devel/hs-unordered-containers/buildlink3.mk"
.include "../../textproc/hs-xml/buildlink3.mk"
.include "../../textproc/hs-xml-conduit/buildlink3.mk"
+.include "../../textproc/hs-yaml/buildlink3.mk"
.include "../../archivers/hs-zip-archive/buildlink3.mk"
.include "../../archivers/hs-zlib/buildlink3.mk"
.include "../../mk/haskell.mk"
diff --git a/converters/pandoc/PLIST b/converters/pandoc/PLIST
index 0e50f40ce22..7628afa071d 100644
--- a/converters/pandoc/PLIST
+++ b/converters/pandoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/25 07:50:13 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/02/12 08:16:02 pho Exp $
bin/pandoc
lib/${PKGNAME}/${HS_VERSION}/package-description
lib/${PKGNAME}/${HS_VERSION}/package-id
@@ -27,9 +27,6 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/App/OutputSettings.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Asciify.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Asciify.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Asciify.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/BCP47.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/BCP47.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/BCP47.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/CSS.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/CSS.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/CSS.p_hi
@@ -75,6 +72,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/PandocMonad.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/PandocPure.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/PandocPure.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/PandocPure.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/Sandbox.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/Sandbox.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Class/Sandbox.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Emoji.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Emoji.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Emoji.p_hi
@@ -87,6 +87,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Extensions.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/Environment.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/Environment.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/Environment.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/JSON.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/JSON.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Filter/JSON.p_hi
@@ -123,39 +126,30 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Global.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Init.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Init.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Init.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AST.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AST.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AST.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AnyValue.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AnyValue.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/AnyValue.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/CommonState.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/CommonState.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/CommonState.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Context.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Context.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Context.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/List.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/List.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/List.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/MediaBag.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/MediaBag.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/MediaBag.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/PandocError.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/PandocError.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/PandocError.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/ReaderOptions.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/ReaderOptions.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/ReaderOptions.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/SimpleTable.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/SimpleTable.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/SimpleTable.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Version.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Version.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshaling/Version.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/CommonState.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/CommonState.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/CommonState.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Context.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Context.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Context.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/PandocError.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/PandocError.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/PandocError.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/ReaderOptions.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/ReaderOptions.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/ReaderOptions.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Reference.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Reference.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Reference.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Sources.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Sources.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Sources.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Template.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Template.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/Template.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/WriterOptions.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/WriterOptions.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Marshal/WriterOptions.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/MediaBag.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/MediaBag.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/MediaBag.p_hi
@@ -165,30 +159,33 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Pandoc.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/System.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/System.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/System.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Template.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Template.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Template.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Types.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Types.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Utils.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Utils.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Module/Utils.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Orphans.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Orphans.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Orphans.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Packages.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Packages.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Packages.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/PandocLua.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/PandocLua.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/PandocLua.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Util.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Util.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Util.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Walk.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Walk.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Lua/Walk.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MIME.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MIME.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MIME.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MediaBag.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MediaBag.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/MediaBag.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Network/HTTP.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Network/HTTP.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Network/HTTP.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Options.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Options.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Options.p_hi
@@ -219,6 +216,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Creole.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/CslJson.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/CslJson.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/CslJson.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Custom.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Custom.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Custom.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/DocBook.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/DocBook.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/DocBook.p_hi
@@ -399,6 +399,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Org/Shared.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RST.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RST.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RST.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RTF.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RTF.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/RTF.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Roff.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Roff.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Readers/Roff.p_hi
@@ -429,6 +432,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Shared.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Slides.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Slides.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Slides.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Sources.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Sources.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Sources.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Templates.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Templates.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Templates.p_hi
@@ -453,6 +459,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/AsciiDoc.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/BibTeX.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/BibTeX.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/BibTeX.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Blaze.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Blaze.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Blaze.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/CommonMark.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/CommonMark.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/CommonMark.p_hi
@@ -474,6 +483,12 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/StyleMap.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/StyleMap.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/StyleMap.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Table.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Table.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Table.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Types.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Types.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/Docx/Types.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/DokuWiki.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/DokuWiki.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/DokuWiki.p_hi
@@ -483,6 +498,9 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/EPUB.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/FB2.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/FB2.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/FB2.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/GridTable.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/GridTable.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/GridTable.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/HTML.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/HTML.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Writers/HTML.p_hi
@@ -633,7 +651,6 @@ man/man1/pandoc.1
share/doc/${HS_PLATFORM}/${PKGNAME}/COPYING.md
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-App.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Asciify.html
-share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-BCP47.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Citeproc.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Class.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Emoji.html
@@ -655,6 +672,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-CSV.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-CommonMark.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Creole.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-CslJson.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Custom.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-DocBook.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Docx.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-DokuWiki.html
@@ -675,6 +693,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-OPML.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Odt.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Org.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-RST.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-RTF.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-TWiki.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Textile.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-TikiWiki.html
@@ -683,6 +702,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers-Vimwiki.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Readers.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-SelfContained.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Shared.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Sources.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Templates.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-UTF8.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Pandoc-Writers-AnnotatedTable.html
@@ -815,6 +835,7 @@ share/${HS_PLATFORM}/${PKGNAME}/citeproc/biblatex-localization/turkish.lbx.strin
share/${HS_PLATFORM}/${PKGNAME}/citeproc/biblatex-localization/ukrainian.lbx.strings
share/${HS_PLATFORM}/${PKGNAME}/data/abbreviations
share/${HS_PLATFORM}/${PKGNAME}/data/bash_completion.tpl
+share/${HS_PLATFORM}/${PKGNAME}/data/creole.lua
share/${HS_PLATFORM}/${PKGNAME}/data/default.csl
share/${HS_PLATFORM}/${PKGNAME}/data/docx/[Content_Types].xml
share/${HS_PLATFORM}/${PKGNAME}/data/docx/_rels/.rels
@@ -844,8 +865,6 @@ share/${HS_PLATFORM}/${PKGNAME}/data/odt/meta.xml
share/${HS_PLATFORM}/${PKGNAME}/data/odt/mimetype
share/${HS_PLATFORM}/${PKGNAME}/data/odt/settings.xml
share/${HS_PLATFORM}/${PKGNAME}/data/odt/styles.xml
-share/${HS_PLATFORM}/${PKGNAME}/data/pandoc.List.lua
-share/${HS_PLATFORM}/${PKGNAME}/data/pandoc.lua
share/${HS_PLATFORM}/${PKGNAME}/data/pptx/[Content_Types].xml
share/${HS_PLATFORM}/${PKGNAME}/data/pptx/_rels/.rels
share/${HS_PLATFORM}/${PKGNAME}/data/pptx/docProps/app.xml
@@ -921,6 +940,7 @@ share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.jira
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.latex
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.man
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.markdown
+share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.markua
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.mediawiki
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.ms
share/${HS_PLATFORM}/${PKGNAME}/data/templates/default.muse
diff --git a/converters/pandoc/buildlink3.mk b/converters/pandoc/buildlink3.mk
index 97b7e5ed439..fe7a9a80ab6 100644
--- a/converters/pandoc/buildlink3.mk
+++ b/converters/pandoc/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/01/18 02:48:02 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/02/12 08:16:02 pho Exp $
BUILDLINK_TREE+= pandoc
.if !defined(PANDOC_BUILDLINK3_MK)
PANDOC_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.pandoc+= pandoc>=2.13
-BUILDLINK_ABI_DEPENDS.pandoc+= pandoc>=2.13nb2
+BUILDLINK_API_DEPENDS.pandoc+= pandoc>=2.17.1
+BUILDLINK_ABI_DEPENDS.pandoc+= pandoc>=2.17.1.1
BUILDLINK_PKGSRCDIR.pandoc?= ../../converters/pandoc
.include "../../converters/hs-aeson/buildlink3.mk"
@@ -29,9 +29,11 @@ BUILDLINK_PKGSRCDIR.pandoc?= ../../converters/pandoc
.include "../../textproc/hs-Glob/buildlink3.mk"
.include "../../textproc/hs-haddock-library/buildlink3.mk"
.include "../../lang/hs-hslua/buildlink3.mk"
+.include "../../converters/hs-hslua-aeson/buildlink3.mk"
.include "../../sysutils/hs-hslua-module-path/buildlink3.mk"
.include "../../devel/hs-hslua-module-system/buildlink3.mk"
.include "../../textproc/hs-hslua-module-text/buildlink3.mk"
+.include "../../devel/hs-hslua-module-version/buildlink3.mk"
.include "../../textproc/hs-HsYAML/buildlink3.mk"
.include "../../www/hs-HTTP/buildlink3.mk"
.include "../../www/hs-http-client/buildlink3.mk"
@@ -40,9 +42,12 @@ BUILDLINK_PKGSRCDIR.pandoc?= ../../converters/pandoc
.include "../../devel/hs-ipynb/buildlink3.mk"
.include "../../textproc/hs-jira-wiki-markup/buildlink3.mk"
.include "../../graphics/hs-JuicyPixels/buildlink3.mk"
+.include "../../devel/hs-lpeg/buildlink3.mk"
.include "../../net/hs-network/buildlink3.mk"
.include "../../net/hs-network-uri/buildlink3.mk"
+.include "../../devel/hs-pandoc-lua-marshal/buildlink3.mk"
.include "../../textproc/hs-pandoc-types/buildlink3.mk"
+.include "../../devel/hs-pretty-show/buildlink3.mk"
.include "../../devel/hs-random/buildlink3.mk"
.include "../../devel/hs-safe/buildlink3.mk"
.include "../../math/hs-scientific/buildlink3.mk"
@@ -59,6 +64,7 @@ BUILDLINK_PKGSRCDIR.pandoc?= ../../converters/pandoc
.include "../../devel/hs-unordered-containers/buildlink3.mk"
.include "../../textproc/hs-xml/buildlink3.mk"
.include "../../textproc/hs-xml-conduit/buildlink3.mk"
+.include "../../textproc/hs-yaml/buildlink3.mk"
.include "../../archivers/hs-zip-archive/buildlink3.mk"
.include "../../archivers/hs-zlib/buildlink3.mk"
.endif # PANDOC_BUILDLINK3_MK
diff --git a/converters/pandoc/distinfo b/converters/pandoc/distinfo
index bf139ea216b..7a460e8b143 100644
--- a/converters/pandoc/distinfo
+++ b/converters/pandoc/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:06:48 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/12 08:16:02 pho Exp $
-BLAKE2s (pandoc-2.13.tar.gz) = 1834731096394a528fb69e0e38388b8d48905f386f1c0f6ba77662812020b861
-SHA512 (pandoc-2.13.tar.gz) = c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
-Size (pandoc-2.13.tar.gz) = 12959060 bytes
-SHA1 (patch-pandoc.cabal) = 8f3656f7e4edc50217c2842919a725cf704f16f6
-SHA1 (patch-src_Text_Pandoc_Options.hs) = a688be9b3f0cf2c7ed52748b2f06deb6576d890b
-SHA1 (patch-src_Text_Pandoc_Readers_Docx_Combine.hs) = 27b454db3958dc1c82e86c701af681b3caa0564c
-SHA1 (patch-src_Text_Pandoc_Readers_Haddock.hs) = 5389d70dea10c32d3acf96526925477c7bdfc52f
+BLAKE2s (pandoc-2.17.1.1.tar.gz) = e76b81abde9b9c97776d458d47024ee3cbca3dc732feb3e5e393bb0fdfe8df1b
+SHA512 (pandoc-2.17.1.1.tar.gz) = 1402240d094d62e071349d87d0a2ffe3e82269a80c82a39cefc7c2938ac86594011459068c1dd526127d72dd8c20816896d5c38761e9691370fa11190ec51b06
+Size (pandoc-2.17.1.1.tar.gz) = 7180959 bytes
diff --git a/converters/pandoc/patches/patch-pandoc.cabal b/converters/pandoc/patches/patch-pandoc.cabal
deleted file mode 100644
index cfe1cff8e47..00000000000
--- a/converters/pandoc/patches/patch-pandoc.cabal
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-pandoc.cabal,v 1.2 2021/04/25 07:50:13 pho Exp $
-
-Fix build with attoparsec-0.14.*
-Fix build with haddock-library-1.10.*
-
---- pandoc.cabal.orig 2021-04-25 04:20:36.106850202 +0000
-+++ pandoc.cabal
-@@ -438,7 +438,7 @@ library
- SHA >= 1.6 && < 1.7,
- aeson >= 0.7 && < 1.6,
- aeson-pretty >= 0.8.5 && < 0.9,
-- attoparsec >= 0.12 && < 0.14,
-+ attoparsec >= 0.12 && < 0.15,
- base64-bytestring >= 0.1 && < 1.3,
- binary >= 0.7 && < 0.11,
- blaze-html >= 0.9 && < 0.10,
-@@ -460,7 +460,7 @@ library
- exceptions >= 0.8 && < 0.11,
- file-embed >= 0.0 && < 0.1,
- filepath >= 1.1 && < 1.5,
-- haddock-library >= 1.8 && < 1.10,
-+ haddock-library >= 1.8 && < 1.11,
- hslua >= 1.1 && < 1.4,
- hslua-module-path >= 0.1.0 && < 0.2.0,
- hslua-module-system >= 0.2 && < 0.3,
diff --git a/converters/pandoc/patches/patch-src_Text_Pandoc_Options.hs b/converters/pandoc/patches/patch-src_Text_Pandoc_Options.hs
deleted file mode 100644
index df9e0c6705f..00000000000
--- a/converters/pandoc/patches/patch-src_Text_Pandoc_Options.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_Text_Pandoc_Options.hs,v 1.1 2021/04/25 07:50:13 pho Exp $
-
-Fix build with GHC 9... or what version of GHC allows this? I think
-TemplateHaskell has always been order-sensitive.
-
---- src/Text/Pandoc/Options.hs.orig 2021-04-25 04:26:58.035286453 +0000
-+++ src/Text/Pandoc/Options.hs
-@@ -316,6 +316,11 @@ defaultKaTeXURL :: Text
- defaultKaTeXURL = "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.11.1/"
-
- -- Update documentation in doc/filters.md if this is changed.
-+$(deriveJSON defaultOptions{ constructorTagModifier =
-+ camelCaseStrToHyphenated
-+ } ''TrackChanges)
-+
-+-- Update documentation in doc/filters.md if this is changed.
- $(deriveJSON defaultOptions ''ReaderOptions)
-
- $(deriveJSON defaultOptions{
-@@ -339,11 +344,6 @@ $(deriveJSON defaultOptions{ constructor
-
- $(deriveJSON defaultOptions ''HTMLSlideVariant)
-
---- Update documentation in doc/filters.md if this is changed.
--$(deriveJSON defaultOptions{ constructorTagModifier =
-- camelCaseStrToHyphenated
-- } ''TrackChanges)
--
- $(deriveJSON defaultOptions{ constructorTagModifier =
- camelCaseStrToHyphenated
- } ''WrapOption)
diff --git a/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Docx_Combine.hs b/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Docx_Combine.hs
deleted file mode 100644
index 7bac4ea9d41..00000000000
--- a/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Docx_Combine.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_Text_Pandoc_Readers_Docx_Combine.hs,v 1.1 2021/04/25 07:50:13 pho Exp $
-
-Fix build with GHC 9.
-
---- src/Text/Pandoc/Readers/Docx/Combine.hs.orig 2021-04-25 04:23:41.829773600 +0000
-+++ src/Text/Pandoc/Readers/Docx/Combine.hs
-@@ -61,7 +61,7 @@ import Data.List
- import Data.Bifunctor
- import Data.Sequence ( ViewL (..), ViewR (..), viewl, viewr, spanr, spanl
- , (><), (|>) )
--import Text.Pandoc.Builder
-+import Text.Pandoc.Builder as Builder
-
- data Modifier a = Modifier (a -> a)
- | AttrModifier (Attr -> a -> a) Attr
-@@ -116,12 +116,12 @@ ilModifierAndInnards ils = case viewl $
-
- inlinesL :: Inlines -> (Inlines, Inlines)
- inlinesL ils = case viewl $ unMany ils of
-- (s :< sq) -> (singleton s, Many sq)
-+ (s :< sq) -> (Builder.singleton s, Many sq)
- _ -> (mempty, ils)
-
- inlinesR :: Inlines -> (Inlines, Inlines)
- inlinesR ils = case viewr $ unMany ils of
-- (sq :> s) -> (Many sq, singleton s)
-+ (sq :> s) -> (Many sq, Builder.singleton s)
- _ -> (ils, mempty)
-
- combineInlines :: Inlines -> Inlines -> Inlines
diff --git a/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Haddock.hs b/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Haddock.hs
deleted file mode 100644
index 5cd11666fe3..00000000000
--- a/converters/pandoc/patches/patch-src_Text_Pandoc_Readers_Haddock.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_Text_Pandoc_Readers_Haddock.hs,v 1.1 2021/04/25 07:50:13 pho Exp $
-
-Fix build with haddock-library-1.10.0. I don't think this is a proper
-fix, but let's just hope the upstream will handle this properly.
-
---- src/Text/Pandoc/Readers/Haddock.hs.orig 2021-04-25 04:33:58.688747948 +0000
-+++ src/Text/Pandoc/Readers/Haddock.hs
-@@ -129,7 +129,7 @@ docHToInlines isCode d' =
- 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 (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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 20:17:46 +0000