Skip to content

Commit

Permalink
resolves #2508 lock ttfunk to 1.7.x (PR #2509)
Browse files Browse the repository at this point in the history
  • Loading branch information
mojavelinux authored Mar 12, 2024
1 parent 582f2d6 commit 21760a1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
1 change: 1 addition & 0 deletions asciidoctor-pdf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 6 additions & 0 deletions lib/asciidoctor/pdf.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Binary file modified spec/reference/font-otf.pdf
Binary file not shown.

0 comments on commit 21760a1

Please sign in to comment.