guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 1feffe8f11ed83adea627979201efdf323991c93
Author: Aaron Covrig <[email protected]>
AuthorDate: Sun Feb 15 14:08:22 2026 -0500
gnu: ruby-asciidoctor-pdf: Update to 2.3.24.
* gnu/packages/ruby-xyz.scm (ruby-asciidoctor-pdf): Update to 2.3.24.
[arguments]<#:phases>{relax-dependencies}: New phase.
{check}: Enable nearly all tests.
[native-inputs]: Add poppler.
* gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch:
Remove gemspec changes but keep test fixes.
Change-Id: I8343bfacec63619f935d9424f7e5ee6399c032ba
Signed-off-by: Andreas Enge <[email protected]>
---
...by-asciidoctor-pdf-support-prawn-svg-0_36.patch | 16 ----------
gnu/packages/ruby-xyz.scm | 34 ++++++++++++++++++----
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git
a/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch
b/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch
index 2f616e1c0d..5db48718f0 100644
--- a/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch
+++ b/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch
@@ -5,7 +5,6 @@ Subject: [PATCH] Update prawn-svg to 0.36.0
https://github.com/asciidoctor/asciidoctor-pdf/pull/2553
---
- asciidoctor-pdf.gemspec | 4 ++--
spec/admonition_spec.rb | 4 ++--
spec/cover_page_spec.rb | 2 +-
spec/image_spec.rb | 2 +-
@@ -13,21 +12,6 @@ https://github.com/asciidoctor/asciidoctor-pdf/pull/2553
spec/running_content_spec.rb | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/asciidoctor-pdf.gemspec b/asciidoctor-pdf.gemspec
-index 997e260e..c09a110d 100644
---- a/asciidoctor-pdf.gemspec
-+++ b/asciidoctor-pdf.gemspec
-@@ -39,8 +39,8 @@ Gem::Specification.new do |s|
- 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'
-- s.add_runtime_dependency 'prawn-svg', '~> 0.34.0'
-- s.add_runtime_dependency 'prawn-icon', '~> 3.0.0'
-+ s.add_runtime_dependency 'prawn-svg', '~> 0.36.0'
-+ s.add_runtime_dependency 'prawn-icon', '~> 3.1.0'
- s.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
- s.add_runtime_dependency 'treetop', '~> 1.6.0'
-
diff --git a/spec/admonition_spec.rb b/spec/admonition_spec.rb
index 0131a097..ca3eb74a 100644
--- a/spec/admonition_spec.rb
diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm
index 6fe2a0720e..c1d548a2d7 100644
--- a/gnu/packages/ruby-xyz.scm
+++ b/gnu/packages/ruby-xyz.scm
@@ -91,6 +91,7 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages node)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
@@ -1988,7 +1989,7 @@ web pages.")
(define-public ruby-asciidoctor-pdf
(package
(name "ruby-asciidoctor-pdf")
- (version "2.3.19")
+ (version "2.3.24")
(source
(origin
(method git-fetch) ;no test suite in the distributed gem
@@ -1998,16 +1999,19 @@ web pages.")
(file-name (git-file-name name version))
(sha256
(base32
- "1l8my8jj4aww2yad80n6f7hs76lq5gicld8dy014pw90pk3x43mp"))
+ "0njpbgfdwzw7rbjj5vg5xjmykm55x588fk437nvaqg6bq7pv66mw"))
(patches
(search-patches
"ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch"))))
(build-system ruby-build-system)
(arguments
(list
- #:test-target "spec"
#:phases
#~(modify-phases %standard-phases
+ (add-after 'extract-gemspec 'relax-dependencies
+ (lambda _
+ (substitute* "asciidoctor-pdf.gemspec"
+ (("~>") ">="))))
;; The tests rely on the Gem being installed, so move the check
;; phase after the install phase.
(delete 'check)
@@ -2017,10 +2021,28 @@ web pages.")
(getenv "GEM_PATH") ":"
#$output "/lib/ruby/vendor_ruby"))
(when tests?
- (invoke "rspec" "-t" "~visual" "-t" "~cli"
- "-t" "~network")))))))
+ (let ((skippedtests
+ (list ;; Disable tests requiring write access
+ "should render linear gradient in SVG"
+ ;; Disable visual+cli tests requiring network
access
+ "should allow remote image in SVG to be read if
allow"
+ "should warn if remote image is missing and
allow"
+ "should replace video with poster image if allow"
+ "should read remote image over"
+ "should embed remote image")))
+ (setenv "SPEC_OPTS"
+ (string-append
+ "--warnings" " "
+ ;; Disable tests failing in the guix environment:
+ "--example-matches "
+ "'(^(?!.*(" (string-join skippedtests "|") ")).*)'")))
+ ;; The Fontconfig error: No writable cache directories errors
+ ;; are caused by our read-only test environment and are
+ ;; non-failing
+ (invoke "rspec" "-t" "~network")))))))
(native-inputs
- (list ruby-chunky-png
+ (list poppler
+ ruby-chunky-png
ruby-coderay
ruby-pdf-inspector
ruby-rouge
