* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor/files/, dev-ruby/asciidoctor/
@ 2015-12-28 6:51 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2015-12-28 6:51 UTC (permalink / raw
To: gentoo-commits
commit: 9c6f43d25a8d5d4b6aa6200e2152eb62387812b8
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 06:51:23 2015 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 06:51:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6f43d2
dev-ruby/asciidoctor: add 1.5.3
Package-Manager: portage-2.2.24
dev-ruby/asciidoctor/Manifest | 1 +
dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild | 46 ++++++++++++++++++++++
.../files/asciidoctor-1.5.3-slim-options.patch | 31 +++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 7d3bf99..ac84096 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1 +1,2 @@
DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
+DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
new file mode 100644
index 0000000..ff08e44
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test features"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_PATCHES=( ${P}-slim-options.patch )
+
+ruby_add_bdepend "test? (
+ dev-util/cucumber
+ dev-ruby/rspec-expectations:*
+ dev-ruby/asciimath
+ dev-ruby/coderay
+ dev-ruby/erubis
+ dev-ruby/haml
+ dev-ruby/nokogiri
+ dev-ruby/slim
+ dev-ruby/tilt )"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/asciidoctor.1
+}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
new file mode 100644
index 0000000..3494269
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
@@ -0,0 +1,31 @@
+From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@softwarelivre.org>
+Date: Tue, 17 Nov 2015 11:17:16 -0200
+Subject: [PATCH] Initialize slim-related attributes regardless of when slim
+ was loaded
+
+Setting instance attributes of the Template class cannot depend on
+whether slim has been loaded before or not.
+---
+ lib/asciidoctor/converter/template.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
+index 10eaa99..43be87b 100644
+--- a/lib/asciidoctor/converter/template.rb
++++ b/lib/asciidoctor/converter/template.rb
+@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
+ unless defined? ::Slim
+ # slim doesn't get loaded by Tilt, so we have to load it explicitly
+ Helpers.require_library 'slim'
+- if @safe && ::Slim::VERSION >= '3.0'
+- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
+- slim_asciidoc_opts[:safe] ||= @safe
+- end
++ end
++ if @safe && ::Slim::VERSION >= '3.0'
++ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
++ slim_asciidoc_opts[:safe] ||= @safe
+ end
+ # load include plugin when using Slim >= 2.1
+ require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor/files/, dev-ruby/asciidoctor/
@ 2016-03-06 22:21 Manuel Rüger
0 siblings, 0 replies; 3+ messages in thread
From: Manuel Rüger @ 2016-03-06 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 90556cf2d63ed053cf1b47d2e559d7dbade24622
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 22:18:19 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 22:21:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90556cf2
dev-ruby/asciidoctor: Remove old
Package-Manager: portage-2.2.27
dev-ruby/asciidoctor/Manifest | 2 -
dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild | 43 --------------------
dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild | 46 ----------------------
.../files/asciidoctor-1.5.3-slim-options.patch | 31 ---------------
4 files changed, 122 deletions(-)
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index b3a9124..cf72b92 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,3 +1 @@
-DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
-DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
DIST asciidoctor-1.5.4.tar.gz 520793 SHA256 2963fdf5ce12962e3a514d7d83426897184c947de5df89300ee524970dc2f3bc SHA512 c3a6405a6c39d1aa70e4d10ce42a6f6e01f3b7ddd8f695e8043fce9116ac91ad1f1f881a449ee8a61172213720dae1285f9c4de03a5cec908de906ed5b14e626 WHIRLPOOL bb06147e6c77fc5d0133b0b747103ec362cc724624087cb84756b2a193540e6b164aed1c8a20a1578298be135e7b65938ae07a902409ba778c25792bd6350ec9
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
deleted file mode 100644
index 6448f8f..0000000
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc source files or strings into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
- dev-util/cucumber
- dev-ruby/rspec-expectations:*
- dev-ruby/coderay
- dev-ruby/erubis
- dev-ruby/haml
- dev-ruby/nokogiri
- dev-ruby/slim
- dev-ruby/tilt )"
-
-all_ruby_prepare() {
- rm Gemfile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
deleted file mode 100644
index ff08e44..0000000
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_PATCHES=( ${P}-slim-options.patch )
-
-ruby_add_bdepend "test? (
- dev-util/cucumber
- dev-ruby/rspec-expectations:*
- dev-ruby/asciimath
- dev-ruby/coderay
- dev-ruby/erubis
- dev-ruby/haml
- dev-ruby/nokogiri
- dev-ruby/slim
- dev-ruby/tilt )"
-
-all_ruby_prepare() {
- rm Gemfile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
deleted file mode 100644
index 3494269..0000000
--- a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro@softwarelivre.org>
-Date: Tue, 17 Nov 2015 11:17:16 -0200
-Subject: [PATCH] Initialize slim-related attributes regardless of when slim
- was loaded
-
-Setting instance attributes of the Template class cannot depend on
-whether slim has been loaded before or not.
----
- lib/asciidoctor/converter/template.rb | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
-index 10eaa99..43be87b 100644
---- a/lib/asciidoctor/converter/template.rb
-+++ b/lib/asciidoctor/converter/template.rb
-@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
- unless defined? ::Slim
- # slim doesn't get loaded by Tilt, so we have to load it explicitly
- Helpers.require_library 'slim'
-- if @safe && ::Slim::VERSION >= '3.0'
-- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
-- slim_asciidoc_opts[:safe] ||= @safe
-- end
-+ end
-+ if @safe && ::Slim::VERSION >= '3.0'
-+ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
-+ slim_asciidoc_opts[:safe] ||= @safe
- end
- # load include plugin when using Slim >= 2.1
- require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor/files/, dev-ruby/asciidoctor/
@ 2023-04-07 14:26 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-04-07 14:26 UTC (permalink / raw
To: gentoo-commits
commit: e23a9359aab2c642efffb438795a52ca029941db
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 14:03:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 14:25:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23a9359
dev-ruby/asciidoctor: enable ruby32
Adds two patches, but it's low risk:
1. Port to haml-6, but it's only a test dep;
2. Add a ruby32 patch which Fedora have been using for a while.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild | 56 +++++++++
.../files/asciidoctor-2.0.18-haml-6.patch | 130 +++++++++++++++++++++
.../files/asciidoctor-2.0.18-ruby32.patch | 29 +++++
3 files changed, 215 insertions(+)
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..2ed8b6ee1b63
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="CUCUMBER_PUBLISH_QUIET=true test features"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="asciidoctor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-util/cucumber
+ dev-ruby/rspec-expectations:*
+ dev-ruby/asciimath
+ dev-ruby/coderay
+ dev-ruby/concurrent-ruby
+ dev-ruby/erubi
+ dev-ruby/haml:6
+ dev-ruby/nokogiri
+ dev-ruby/rouge
+ dev-ruby/slim
+ dev-ruby/tilt )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.18-haml-6.patch
+ "${FILESDIR}"/${PN}-2.0.18-ruby32.patch
+)
+
+all_ruby_prepare() {
+ rm Gemfile || die
+
+ sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid broken blocks_test.rb (already appears to be fixed upstream)
+ rm -f test/blocks_test.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/asciidoctor.1
+}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch
new file mode 100644
index 000000000000..b6896999f838
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch
@@ -0,0 +1,130 @@
+https://sources.debian.org/patches/asciidoctor/2.0.18-2/0001-Port-tests-to-haml-6.patch/ (backport)
+https://github.com/asciidoctor/asciidoctor/pull/4395
+
+From 25ee484dd66cc813eaa421d1c104ae64478e51ff Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@debian.org>
+Date: Mon, 26 Dec 2022 13:11:36 -0300
+Subject: [PATCH] Port tests to haml 6
+
+Forwarded: https://github.com/asciidoctor/asciidoctor/pull/4395
+Fixes: #4382
+--- a/asciidoctor.gemspec
++++ b/asciidoctor.gemspec
+@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
+ s.add_development_dependency 'cucumber', '~> 3.1.0'
+ # erubi is needed for testing alternate eRuby impls
+ s.add_development_dependency 'erubi', '~> 1.10.0'
+- s.add_development_dependency 'haml', '~> 5.2.0'
++ s.add_development_dependency 'haml', '~> 6.1'
+ s.add_development_dependency 'minitest', '~> 5.14.0'
+ s.add_development_dependency 'nokogiri', '~> 1.10.0'
+ s.add_development_dependency 'rake', '~> 12.3.0'
+--- a/lib/asciidoctor/converter/template.rb
++++ b/lib/asciidoctor/converter/template.rb
+@@ -29,7 +29,7 @@ class Converter::TemplateConverter < Con
+ erb: { trim: 0 },
+ # TODO line 466 of haml/compiler.rb sorts the attributes; file an issue to make this configurable
+ # NOTE AsciiDoc syntax expects HTML/XML output to use double quotes around attribute values
+- haml: { format: :xhtml, attr_wrapper: '"', escape_attrs: false, ugly: true },
++ haml: { format: :xhtml, attr_quote: '"', escape_attrs: false, ugly: true },
+ slim: { disable_escape: true, sort_attrs: false, pretty: false },
+ }
+
+--- a/test/converter_test.rb
++++ b/test/converter_test.rb
+@@ -9,7 +9,7 @@ context 'Converter' do
+ assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+ selected = doc.converter.find_converter('paragraph')
+ assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+- assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++ assert_kind_of Haml::Template, selected.templates['paragraph']
+ assert_equal :html5, selected.templates['paragraph'].options[:format]
+ end
+
+@@ -18,7 +18,7 @@ context 'Converter' do
+ assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+ selected = doc.converter.find_converter('paragraph')
+ assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+- assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++ assert_kind_of Haml::Template, selected.templates['paragraph']
+ assert_equal :xhtml, selected.templates['paragraph'].options[:format]
+ end
+
+@@ -95,7 +95,7 @@ context 'Converter' do
+ %w(paragraph sidebar).each do |node_name|
+ selected = doc.converter.find_converter node_name
+ assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+- assert_kind_of Tilt::HamlTemplate, selected.templates[node_name]
++ assert_kind_of Haml::Template, selected.templates[node_name]
+ assert_equal %(block_#{node_name}.html.haml), File.basename(selected.templates[node_name].file)
+ end
+ end
+@@ -126,7 +126,7 @@ context 'Converter' do
+ %w(paragraph).each do |node_name|
+ selected = doc.converter.find_converter node_name
+ assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+- assert_kind_of Tilt::HamlTemplate, selected.templates[node_name]
++ assert_kind_of Haml::Template, selected.templates[node_name]
+ assert_equal %(block_#{node_name}.xml.haml), File.basename(selected.templates[node_name].file)
+ end
+ end
+@@ -215,7 +215,7 @@ context 'Converter' do
+ refute_empty caches[:templates]
+ paragraph_template = caches[:templates].values.find {|t| File.basename(t.file) == 'block_paragraph.html.haml' }
+ refute_nil paragraph_template
+- assert_kind_of ::Tilt::HamlTemplate, paragraph_template
++ assert_kind_of Haml::Template, paragraph_template
+ end
+
+ test 'should be able to disable template cache' do
+--- a/test/fixtures/custom-backends/haml/docbook5/block_paragraph.xml.haml
++++ b/test/fixtures/custom-backends/haml/docbook5/block_paragraph.xml.haml
+@@ -1,6 +1,6 @@
+ - if title?
+ %formalpara{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}
+- %title=title
+- %para=content
++ %title!=title
++ %para!=content
+ - else
+- %para{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}=content
++ %para{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}!=content
+--- a/test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml
++++ b/test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml
+@@ -1 +1 @@
+-%p=content
++%p!=content
+--- a/test/fixtures/custom-backends/haml/html5-tweaks/embedded.html.haml
++++ b/test/fixtures/custom-backends/haml/html5-tweaks/embedded.html.haml
+@@ -1 +1 @@
+-=content
++!=content
+--- a/test/fixtures/custom-backends/haml/html5/block_paragraph.html.haml
++++ b/test/fixtures/custom-backends/haml/html5/block_paragraph.html.haml
+@@ -1,3 +1,3 @@
+ - if title?
+- .title=title
+-%p{id: @id, class: (attr 'role')}=content
++ .title!=title
++%p{id: @id, class: (attr 'role')}!=content
+--- a/test/fixtures/custom-backends/haml/html5/block_sidebar.html.haml
++++ b/test/fixtures/custom-backends/haml/html5/block_sidebar.html.haml
+@@ -1,5 +1,5 @@
+ %aside{id: @id, class: (attr 'role')}
+ - if title?
+ %header
+- %h1=title
+- =content.chomp
++ %h1!=title
++ !=content.chomp
+--- a/test/invoker_test.rb
++++ b/test/invoker_test.rb
+@@ -616,7 +616,7 @@ context 'Invoker' do
+ assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+ selected = doc.converter.find_converter 'paragraph'
+ assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+- assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++ assert_kind_of Haml::Template, selected.templates['paragraph']
+ end
+
+ test 'should load custom templates from multiple template directories' do
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch
new file mode 100644
index 000000000000..86e577c796ec
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch
@@ -0,0 +1,29 @@
+https://github.com/asciidoctor/asciidoctor/commit/b3c05398b1b4b483fe5f9c9ef89dc772863cf6f1
+https://src.fedoraproject.org/rpms/rubygem-asciidoctor/raw/rawhide/f/0001-resolves-4390-fix-call-order-so-use-of-an-include-fi.patch
+
+From b3c05398b1b4b483fe5f9c9ef89dc772863cf6f1 Mon Sep 17 00:00:00 2001
+From: Dan Allen <dan.j.allen@gmail.com>
+Date: Mon, 20 Feb 2023 23:47:59 -0700
+Subject: [PATCH] resolves #4390 fix call order so use of an include file with
+ invalid encoding continues to raise error when using Ruby >= 3.2.0
+
+--- a/lib/asciidoctor/reader.rb
++++ b/lib/asciidoctor/reader.rb
+@@ -1197,15 +1197,16 @@ def preprocess_include_directive target, attrlist
+ push_include inc_lines, inc_path, relpath, inc_offset, parsed_attrs
+ end
+ else
++ inc_content = nil
+ begin
+ # NOTE read content before shift so cursor is only advanced if IO operation succeeds
+ inc_content = reader.call(inc_path, read_mode) {|f| f.read }
+ shift
+- push_include inc_content, inc_path, relpath, 1, parsed_attrs
+ rescue
+ logger.error message_with_context %(include #{target_type} not readable: #{inc_path}), source_location: cursor
+ return replace_next_line %(Unresolved directive in #{@path} - include::#{expanded_target}[#{attrlist}])
+ end
++ push_include inc_content, inc_path, relpath, 1, parsed_attrs
+ end
+ true
+ end
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-07 14:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-07 14:26 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor/files/, dev-ruby/asciidoctor/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-03-06 22:21 Manuel Rüger
2015-12-28 6:51 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox