diff options
| author | Dan Allen <dan.j.allen@gmail.com> | 2024-03-11 21:10:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 21:10:06 -0600 |
| commit | 21760a1591619e606be0f48889af6f871c87772e (patch) | |
| tree | f5dc9619cefef9a2d81232df7a08e4eefa355561 | |
| parent | 582f2d66359fa72313df6b762cbf558faa3f4f36 (diff) | |
resolves #2508 lock ttfunk to 1.7.x (PR #2509)
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | CHANGELOG.adoc | 4 | ||||
| -rw-r--r-- | asciidoctor-pdf.gemspec | 1 | ||||
| -rw-r--r-- | lib/asciidoctor/pdf.rb | 6 | ||||
| -rw-r--r-- | spec/reference/font-otf.pdf | bin | 10164 -> 11109 bytes |
5 files changed, 14 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd4ac1ce..f9d5f8a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,9 +74,9 @@ jobs: #- os: ubuntu-latest # ruby: '3.3' # asciidoctor-version: '~> 2.0.0' - #- os: ubuntu-latest - # ruby: '3.3' - # upstream: upstream + - os: ubuntu-latest + ruby: '3.3' + upstream: upstream - os: ubuntu-latest ruby: '3.3' rouge-version: '~> 4.0.0' @@ -149,7 +149,6 @@ jobs: if: matrix.upstream run: | bundle exec ruby scripts/switch-to-asciidoctor-head.rb - bundle exec ruby scripts/switch-to-prawn-head.rb rm -f Gemfile.lock bundle config --local clean true bundle --jobs 3 --retry 3 diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 3c1d27b8..67eb13c7 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -11,6 +11,10 @@ Improvements:: * drop links from entries in TOC (#2505) +Compliance:: + +* lock ttfunk to 1.7.x to avoid requiring Ruby headers (i.e., development libraries) to install gem (#2508) + == 2.3.14 (2024-03-08) - @mojavelinux Improvements:: diff --git a/asciidoctor-pdf.gemspec b/asciidoctor-pdf.gemspec index 161eb722..997e260e 100644 --- a/asciidoctor-pdf.gemspec +++ b/asciidoctor-pdf.gemspec @@ -35,6 +35,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'asciidoctor', '~> 2.0' s.add_runtime_dependency 'prawn', '~> 2.4.0' + s.add_runtime_dependency 'ttfunk', '~> 1.7.0' # pin ttfunk for compatiblity; prawn gem only pins it to major version s.add_runtime_dependency 'matrix', '~> 0.4' # required until prawn >= 2.5.0 is released s.add_runtime_dependency 'prawn-table', '~> 0.2.0' s.add_runtime_dependency 'prawn-templates', '~> 0.1.0' diff --git a/lib/asciidoctor/pdf.rb b/lib/asciidoctor/pdf.rb index c1de9fab..75a45d21 100644 --- a/lib/asciidoctor/pdf.rb +++ b/lib/asciidoctor/pdf.rb @@ -1,5 +1,11 @@ # frozen_string_literal: true +proc do + old_verbose, $VERBOSE = $VERBOSE, nil + require 'bigdecimal' # eagerly require bigdecimal without warnings to avoid warning caused by ttfunk 1.7.0 + $VERBOSE = old_verbose +end.call + autoload :Set, 'set' autoload :StringIO, 'stringio' autoload :Tempfile, 'tempfile' diff --git a/spec/reference/font-otf.pdf b/spec/reference/font-otf.pdf Binary files differindex 6e0d5c91..cfb3811d 100644 --- a/spec/reference/font-otf.pdf +++ b/spec/reference/font-otf.pdf |