From 4b31e0c4d3eb67e06fc41bc266437081394ce99c Mon Sep 17 00:00:00 2001 From: pho Date: Mon, 29 Apr 2024 02:47:41 +0000 Subject: [PATCH] textproc/hs-commonmark: Update to 0.2.6 0.2.6 * Make list tightness match the reference implementation closer (#150, Michael Howell). This solves the problem where blank lines in the middle of a list are attributed to the list itself instead of the item, making its parent list become spuriously loose. * Fix bug with entities inside link destinations (#149). The bug affects cases like this: [link](\!); the backslash escape was being ignored here. * Commonmark.Entity: export pEntity [API change]. 0.2.5.1 * Replace source with search in list of block tags. This is a spec 0.31 change that was forgotten in the last release. 0.2.5 * Fix HTML comment parser to conform to 0.31.2 spec. * Update spec.txt tests to commonmark-spec 0.31.2. * Match HTML declaration blocks with lowercase letters (Michael Howell). * Specifically track the position where enders end (Michael Howell). 0.2.4.1 * Commonmark.Html: Add aria-hidden, d, and viewBox to allowed attributes list. * Correctly merge list blanks with non-list blanks (#133, Michael Howell). * Do not look for backslashed hard breaks in link titles (#130, Michael Howell). * Work around ghc bug with -K RTS options, to set the stack space properly for tests (#129). See https://gitlab.haskell.org/ghc/ghc/-/issues/10445. * Revert block state completely if lazy line (#126). This fixes an issue with lazily-wrapped footnotes. * Avoid adding trailing newline to list block if it's already there (Michael Howell). This fixes tight/loose classification in a few cases. * Fix incorrectly parsing links with nested [] (Michael Howell). --- textproc/hs-commonmark/Makefile | 5 ++--- textproc/hs-commonmark/PLIST | 8 +++----- textproc/hs-commonmark/buildlink3.mk | 6 +++--- textproc/hs-commonmark/distinfo | 8 ++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/textproc/hs-commonmark/Makefile b/textproc/hs-commonmark/Makefile index 580c25d6d2a8..720092bcaac4 100644 --- a/textproc/hs-commonmark/Makefile +++ b/textproc/hs-commonmark/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2023/11/02 06:37:29 pho Exp $ +# $NetBSD: Makefile,v 1.13 2024/04/29 02:47:41 pho Exp $ -DISTNAME= commonmark-0.2.4 -PKGREVISION= 1 +DISTNAME= commonmark-0.2.6 CATEGORIES= textproc MAINTAINER= pho@cielonegro.org diff --git a/textproc/hs-commonmark/PLIST b/textproc/hs-commonmark/PLIST index afb211132fb8..f3dbb6d003f3 100644 --- a/textproc/hs-commonmark/PLIST +++ b/textproc/hs-commonmark/PLIST @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2023/10/26 17:18:54 pho Exp $ -lib/commonmark-${PKGVERSION}/${HS_VERSION}/package-description -lib/commonmark-${PKGVERSION}/${HS_VERSION}/package-id +@comment $NetBSD: PLIST,v 1.4 2024/04/29 02:47:41 pho Exp $ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark.p_hi @@ -43,6 +41,8 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Types.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +lib/commonmark-${PKGVERSION}/${HS_VERSION}/package-description +lib/commonmark-${PKGVERSION}/${HS_VERSION}/package-id share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/Commonmark-Blocks.html ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/Commonmark-Entity.html @@ -79,11 +79,9 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/doc-index-T.h ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/doc-index-U.html ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/doc-index-W.html ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/quick-jump.css -${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/commonmark-${PKGVERSION}/html/synopsis.png diff --git a/textproc/hs-commonmark/buildlink3.mk b/textproc/hs-commonmark/buildlink3.mk index c05aa8d74fcc..e963b8bfa8c7 100644 --- a/textproc/hs-commonmark/buildlink3.mk +++ b/textproc/hs-commonmark/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2023/11/02 06:37:29 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2024/04/29 02:47:41 pho Exp $ BUILDLINK_TREE+= hs-commonmark .if !defined(HS_COMMONMARK_BUILDLINK3_MK) HS_COMMONMARK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-commonmark+= hs-commonmark>=0.2.4 -BUILDLINK_ABI_DEPENDS.hs-commonmark+= hs-commonmark>=0.2.4nb1 +BUILDLINK_API_DEPENDS.hs-commonmark+= hs-commonmark>=0.2.6 +BUILDLINK_ABI_DEPENDS.hs-commonmark+= hs-commonmark>=0.2.6 BUILDLINK_PKGSRCDIR.hs-commonmark?= ../../textproc/hs-commonmark .include "../../textproc/hs-unicode-data/buildlink3.mk" diff --git a/textproc/hs-commonmark/distinfo b/textproc/hs-commonmark/distinfo index e9021ddc7ea8..49355a96bf5e 100644 --- a/textproc/hs-commonmark/distinfo +++ b/textproc/hs-commonmark/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2023/10/28 09:52:23 pho Exp $ +$NetBSD: distinfo,v 1.8 2024/04/29 02:47:41 pho Exp $ -BLAKE2s (commonmark-0.2.4.tar.gz) = dbb59075f371e7167b8f937affe2faddd6fa4ff66f68bb6ce55fc77bd91821f2 -SHA512 (commonmark-0.2.4.tar.gz) = 70a4d8a74de6b363ccf9456b1f67dbd818aad27494ebb0924c638ffe2bd178e54d83818dc5e2fa72c70c09f3f9888b3a741459733927d57bf046ee1f69337b0e -Size (commonmark-0.2.4.tar.gz) = 102623 bytes +BLAKE2s (commonmark-0.2.6.tar.gz) = 627807b51c837dd1a435a90e0a8f3cc59d0aa40900a447c20904824e8619a535 +SHA512 (commonmark-0.2.6.tar.gz) = a13bd02ce9d2c1bb686b0a369cdc93d40cefdfb94e0388da5d9bd684c405198e066c005aaa9dd7c701735bab8d0aa494e72b753e4cacfe4a9117d4d875f9f3d1 +Size (commonmark-0.2.6.tar.gz) = 104222 bytes