[DRE-maint] Bug#918234: ruby-asciidoctor-pdf: FTBFS in sid

[Cédric Boutillier]

Package: ruby-asciidoctor-pdf
Followup-For: Bug #918234

The log in the report corresponds to a transient bug during the update of ruby-
prawn (earlier version depended on earlier version of ruby-ttfunk).

So this part is gone. But the dependency check still fails now because of
version mismatch of ruby-treetop: the gemspec file wants version 1.5.3 whereas
the archive has 1.6.8

The solution is to patch further the gemspec file to relax strict dependency on
this version of treetop.

diff --git a/debian/patches/0001-Fix-dependencies-for-debian-build.patch
b/debian/patches/0001-Fix-dependencies-for-debian-build.patch
index 05748d1..589b7f4 100644
--- a/debian/patches/0001-Fix-dependencies-for-debian-build.patch
+++ b/debian/patches/0001-Fix-dependencies-for-debian-build.patch
@@ -14,11 +14,9 @@ Signed-off-by: Keith Packard <keithp at keithp.com>
  lib/asciidoctor-pdf/prawn-templates_ext.rb | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)

-diff --git a/asciidoctor-pdf.gemspec b/asciidoctor-pdf.gemspec
-index 940bc9f..59b23c9 100644
 --- a/asciidoctor-pdf.gemspec
 +++ b/asciidoctor-pdf.gemspec
-@@ -43,10 +43,10 @@ An extension for Asciidoctor that converts AsciiDoc
documents to PDF using the P
+@@ -43,13 +43,13 @@
    s.add_runtime_dependency 'prawn', '>= 1.3.0', '< 2.3.0'
    s.add_runtime_dependency 'prawn-table', '0.2.2'
    # prawn-templates >= 0.0.5 requires prawn >= 2.2.0, so we must cast a wider
net to support Ruby 1.9.3
@@ -32,11 +30,13 @@ index 940bc9f..59b23c9 100644
    s.add_runtime_dependency 'safe_yaml', '~> 1.0.4'
    s.add_runtime_dependency 'thread_safe', '~> 0.3.6'
    s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.5'
-diff --git a/lib/asciidoctor-pdf/prawn-templates_ext.rb b/lib/asciidoctor-
pdf/prawn-templates_ext.rb
-index fca8178..92fe260 100644
+   # For our usage, treetop 1.6.2 is slower than 1.5.3
+-  s.add_runtime_dependency 'treetop', '1.5.3'
++  s.add_runtime_dependency 'treetop', '>= 1.5.3'
+ end
 --- a/lib/asciidoctor-pdf/prawn-templates_ext.rb
 +++ b/lib/asciidoctor-pdf/prawn-templates_ext.rb
-@@ -2,4 +2,4 @@ class Prawn::Document
+@@ -2,4 +2,4 @@
    # NOTE allows prawn-templates 0.0.4 to be used with prawn >= 2.2.0
    const_set :VALID_OPTIONS, (send :remove_const, :VALID_OPTIONS).dup if
VALID_OPTIONS.frozen?
  end



-- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE= (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages ruby-asciidoctor-pdf depends on:
ii  ruby              1:2.5.1
ii  ruby-asciidoctor  1.5.8-1
ii  ruby-concurrent   1.0.5-2
ii  ruby-prawn        2.2.0+dfsg-1
ii  ruby-prawn-icon   2.3.0-2
ii  ruby-prawn-svg    0.28.0-2
ii  ruby-prawn-table  0.2.2-1
ii  ruby-safe-yaml    1.0.4-2
ii  ruby-thread-safe  0.3.6-1
ii  ruby-treetop      1.6.8-1

ruby-asciidoctor-pdf recommends no packages.

ruby-asciidoctor-pdf suggests no packages.
-------------- next part --------------
diff --git a/debian/patches/0001-Fix-dependencies-for-debian-build.patch b/debian/patches/0001-Fix-dependencies-for-debian-build.patch
index 05748d1..589b7f4 100644
--- a/debian/patches/0001-Fix-dependencies-for-debian-build.patch
+++ b/debian/patches/0001-Fix-dependencies-for-debian-build.patch
@@ -14,11 +14,9 @@ Signed-off-by: Keith Packard <keithp at keithp.com>
  lib/asciidoctor-pdf/prawn-templates_ext.rb | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/asciidoctor-pdf.gemspec b/asciidoctor-pdf.gemspec
-index 940bc9f..59b23c9 100644
 --- a/asciidoctor-pdf.gemspec
 +++ b/asciidoctor-pdf.gemspec
-@@ -43,10 +43,10 @@ An extension for Asciidoctor that converts AsciiDoc documents to PDF using the P
+@@ -43,13 +43,13 @@
    s.add_runtime_dependency 'prawn', '>= 1.3.0', '< 2.3.0'
    s.add_runtime_dependency 'prawn-table', '0.2.2'
    # prawn-templates >= 0.0.5 requires prawn >= 2.2.0, so we must cast a wider net to support Ruby 1.9.3
@@ -32,11 +30,13 @@ index 940bc9f..59b23c9 100644
    s.add_runtime_dependency 'safe_yaml', '~> 1.0.4'
    s.add_runtime_dependency 'thread_safe', '~> 0.3.6'
    s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.5'
-diff --git a/lib/asciidoctor-pdf/prawn-templates_ext.rb b/lib/asciidoctor-pdf/prawn-templates_ext.rb
-index fca8178..92fe260 100644
+   # For our usage, treetop 1.6.2 is slower than 1.5.3
+-  s.add_runtime_dependency 'treetop', '1.5.3'
++  s.add_runtime_dependency 'treetop', '>= 1.5.3'
+ end
 --- a/lib/asciidoctor-pdf/prawn-templates_ext.rb
 +++ b/lib/asciidoctor-pdf/prawn-templates_ext.rb
-@@ -2,4 +2,4 @@ class Prawn::Document
+@@ -2,4 +2,4 @@
    # NOTE allows prawn-templates 0.0.4 to be used with prawn >= 2.2.0
    const_set :VALID_OPTIONS, (send :remove_const, :VALID_OPTIONS).dup if VALID_OPTIONS.frozen?
  end