CVS commit: pkgsrc/textproc/ruby-kramdown-rfc2629

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sun Jan 17 17:26:15 UTC 2021

Modified Files:
        pkgsrc/textproc/ruby-kramdown-rfc2629: Makefile distinfo
Added Files:
        pkgsrc/textproc/ruby-kramdown-rfc2629/patches:
            patch-lib_kramdown-rfc2629.rb

Log Message:
kramdown-rfc2629: Patch to work with kramdown 2.0.

That's what we have as textproc/ruby-kramdown; it seems to function
with that.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile \
    pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/ruby-kramdown-rfc2629/patches/patch-lib_kramdown-rfc2629.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile
diff -u pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile:1.1 pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile:1.2
--- pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile:1.1  Sat Jan 16 20:50:04 2021
+++ pkgsrc/textproc/ruby-kramdown-rfc2629/Makefile      Sun Jan 17 17:26:15 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/01/16 20:50:04 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2021/01/17 17:26:15 riastradh Exp $
 
 DISTNAME=      kramdown-rfc2629-1.3.24
+PKGREVISION=   1
 CATEGORIES=    textproc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -10,5 +11,11 @@ LICENSE=     mit
 
 USE_LANGUAGES= # none
 
+OVERRIDE_GEMSPEC+=     certified:
+OVERRIDE_GEMSPEC+=     kramdown>=2.0
+
+DEPENDS+=      ${RUBY_PKGPREFIX}-json>=2.0:../../textproc/ruby-json
+DEPENDS+=      ${RUBY_PKGPREFIX}-kramdown>=2.0:../../textproc/ruby-kramdown
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo
diff -u pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo:1.1 pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo:1.2
--- pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo:1.1  Sat Jan 16 20:50:04 2021
+++ pkgsrc/textproc/ruby-kramdown-rfc2629/distinfo      Sun Jan 17 17:26:15 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2021/01/16 20:50:04 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2021/01/17 17:26:15 riastradh Exp $
 
 SHA1 (kramdown-rfc2629-1.3.24.gem) = 307bba99cab92e156ad1a7aab6ddcaf31bb1cf9f
 RMD160 (kramdown-rfc2629-1.3.24.gem) = 22730dd175a292702d9ea2e3155a1e4450d43eec
 SHA512 (kramdown-rfc2629-1.3.24.gem) = 32af06b9ed0e6e15298898449f240a1db7511a707fdca51be32fa221951fe560b8b64f55eb831a95469a7252ab02841ec3c965785124d56f354eac0c4043414f
 Size (kramdown-rfc2629-1.3.24.gem) = 41472 bytes
+SHA1 (patch-lib_kramdown-rfc2629.rb) = f9d200908675d904cb56373dc8c407bd61008760

Added files:

Index: pkgsrc/textproc/ruby-kramdown-rfc2629/patches/patch-lib_kramdown-rfc2629.rb
diff -u /dev/null pkgsrc/textproc/ruby-kramdown-rfc2629/patches/patch-lib_kramdown-rfc2629.rb:1.1
--- /dev/null   Sun Jan 17 17:26:15 2021
+++ pkgsrc/textproc/ruby-kramdown-rfc2629/patches/patch-lib_kramdown-rfc2629.rb Sun Jan 17 17:26:15 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_kramdown-rfc2629.rb,v 1.1 2021/01/17 17:26:15 riastradh Exp $
+
+Make this work with kramdown 2.x, which is what we have in pkgsrc.
+This seems to work fine, and certainly better than trying to use 1.17.0
+which fails on startup.
+
+--- lib/kramdown-rfc2629.rb.orig       2021-01-16 21:48:50.361415982 +0000
++++ lib/kramdown-rfc2629.rb
+@@ -12,7 +12,7 @@ require 'shellwords'
+ 
+ raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
+ 
+-gem 'kramdown', '~> 1.17.0'
++gem 'kramdown', '~> 2.0'
+ require 'kramdown'
+ my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
+ Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements