From 25bf6281a647f52c0d511444a99d2da0873a1731 Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Thu, 7 Nov 2024 17:17:37 +0100 Subject: [PATCH 1/2] Fix generation of documentation as PDF document * Pin Ascii85 to 1.1.1 because newer versions need Ruby 2.7 * See https://progress.opensuse.org/issues/169246 --- tools/generate-documentation | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/generate-documentation b/tools/generate-documentation index d3f35e709d1..0ffb9c8b0b1 100755 --- a/tools/generate-documentation +++ b/tools/generate-documentation @@ -204,11 +204,13 @@ install_asciidoctor() { gem install pygments.rb -v 2.4.1 # Note: pin to 4.0.7 because newer versions of publix_suffix need Ruby 2.6 # Note: pin to 1.12.0 because newer versions of css_parser need Ruby 2.7 + # Note: pin to 1.1.1 because newer versions of Ascii85 need Ruby 2.7 # Note: pin to 1.6.2 because newer versions of asciidoctor-pdf need Ruby 2.7 [[ ${formats[pdf]} ]] && { gem install public_suffix -v 4.0.7 gem install css_parser -v 1.12.0 gem install ttfunk -v 1.7.0 + gem install Ascii85 -v 1.1.1 gem install asciidoctor-pdf -v 1.6.2 } cpanm -M https://cpan.metacpan.org --install Pod::AsciiDoctor From f49814ca1f2cdf39616ffad4d547413be02e9813 Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Thu, 7 Nov 2024 17:22:06 +0100 Subject: [PATCH 2/2] Avoid repeating information in comments in doc generation code --- tools/generate-documentation | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/generate-documentation b/tools/generate-documentation index 0ffb9c8b0b1..d21f1048780 100755 --- a/tools/generate-documentation +++ b/tools/generate-documentation @@ -200,18 +200,13 @@ check_asciidoctor() { install_asciidoctor() { # install dependencies gem install asciidoctor - # Note: pin to 2.4.1 because newer versions of pygments.rb need Ruby 2.6 - gem install pygments.rb -v 2.4.1 - # Note: pin to 4.0.7 because newer versions of publix_suffix need Ruby 2.6 - # Note: pin to 1.12.0 because newer versions of css_parser need Ruby 2.7 - # Note: pin to 1.1.1 because newer versions of Ascii85 need Ruby 2.7 - # Note: pin to 1.6.2 because newer versions of asciidoctor-pdf need Ruby 2.7 + gem install pygments.rb -v 2.4.1 # newer versions need Ruby 2.6 [[ ${formats[pdf]} ]] && { - gem install public_suffix -v 4.0.7 - gem install css_parser -v 1.12.0 + gem install public_suffix -v 4.0.7 # newer versions need Ruby 2.6 + gem install css_parser -v 1.12.0 # newer versions need Ruby 2.7 gem install ttfunk -v 1.7.0 - gem install Ascii85 -v 1.1.1 - gem install asciidoctor-pdf -v 1.6.2 + gem install Ascii85 -v 1.1.1 # newer versions need Ruby 2.7 + gem install asciidoctor-pdf -v 1.6.2 # newer versions need Ruby 2.7 } cpanm -M https://cpan.metacpan.org --install Pod::AsciiDoctor }