summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-01-06 01:19:40 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-01-08 00:41:04 -0500
commitc16e11bb2f8e6068628a188e199614a07f80c861 (patch)
tree6801120a4c51c0f089bc07d8d0718b2d338b3315
parentad6350ab8bb67fe0c2c815113f92a36945acdd11 (diff)
downloadguix-c16e11bb2f8e6068628a188e199614a07f80c861.tar.gz
gnu: ruby-ttfunk: Update to 1.7.0.
* gnu/packages/ruby.scm (ruby-ttfunk): Update to 1.7.0.
[source]: Fix indentation.  Use complete sentences for comments.
[arguments]: Use gexps.  Add comment next to #:test-target.  Delete
remove-rubocop and remove-ssh phases.  Add remove-missing-key-directive phase.
[native-inputs]: Remove ruby-rspec, ruby-yard and bundler.  Add
ruby-prawn-dev.
-rw-r--r--gnu/packages/ruby.scm40
1 files changed, 15 insertions, 25 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 5a70c65118..b4fb4bf141 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -9719,40 +9719,30 @@ binary-to-text encoding.  The main modern use of Ascii85 is in PostScript and
 (define-public ruby-ttfunk
   (package
     (name "ruby-ttfunk")
-    (version "1.6.2.1")
+    (version "1.7.0")
     (source
      (origin
        (method git-fetch)
-       ;; fetch from github as the gem does not contain testing code
+       ;; Fetch from github as the gem does not contain testing code.
        (uri (git-reference
-              (url "https://github.com/prawnpdf/ttfunk")
-              (commit version)))
+             (url "https://github.com/prawnpdf/ttfunk")
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0rsf4j6s97wbcnjbvmmh6xrc7imw4g9lrlcvn945wh400lc8r53z"))))
+         "1jyxn928mpyb1sikjd93s3v8fmh33232pq41ziaph513j7am6fi5"))))
     (build-system ruby-build-system)
     (arguments
-     `(#:test-target "spec"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'remove-ssh
-           (lambda _
-             ;; remove dependency on an ssh key pair that doesn't exist
-             (substitute* "ttfunk.gemspec"
-               (("spec.signing_key.*") ""))
-             #t))
-         (add-before 'check 'remove-rubocop
-           (lambda _
-             ;; remove rubocop as a dependency as not needed for testing
-             (substitute* "ttfunk.gemspec"
-               (("spec.add_development_dependency\\('rubocop'.*") ""))
-             (substitute* "Rakefile"
-               (("require 'rubocop/rake_task'") "")
-               (("RuboCop::RakeTask.new") ""))
-             #t)))))
-    (native-inputs
-     (list ruby-rspec ruby-yard bundler))
+     (list #:test-target "spec"         ;avoid the rubocop target
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'remove-missing-key-directive
+                 ;; This seem to be a common problem in Ruby projects (see:
+                 ;; https://github.com/prawnpdf/ttfunk/issues/99).
+                 (lambda _
+                   (substitute* "ttfunk.gemspec"
+                     ((".*spec.signing_key.*") "")))))))
+    (native-inputs (list ruby-prawn-dev))
     (synopsis "Font metrics parser for the Prawn PDF generator")
     (description
      "TTFunk is a TrueType font parser written in pure Ruby.  It is used as