01/02: gnu: terminology: Update to 1.2.0.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 5e94ce97948c556630bf95ec7de039b67cec8141
Author: Efraim Flashner <address@hidden>
Date:   Thu Apr 26 09:18:22 2018 +0300

    gnu: terminology: Update to 1.2.0.
    
    * gnu/packages/enlightenment.scm (terminology): Update to 1.2.0.
    [source]: Update source snippet.
    [build-system]: Switch to meson-build-system.
    [native-inputs]: Add perl.
---
 gnu/packages/enlightenment.scm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 0138b72..c9a5822 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pdf)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
@@ -179,7 +180,7 @@ removable devices or support for multimedia.")
 (define-public terminology
   (package
     (name "terminology")
-    (version "1.1.1")
+    (version "1.2.0")
     (source (origin
               (method url-fetch)
               (uri
@@ -187,24 +188,17 @@ removable devices or support for multimedia.")
                               "terminology/terminology-" version ".tar.xz"))
               (sha256
                (base32
-                "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns"))
+                "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx"))
               (modules '((guix build utils)))
               ;; Remove the bundled fonts.
               ;; TODO: Remove bundled lz4.
               (snippet
                '(begin
                   (delete-file-recursively "data/fonts")
-                  (substitute* '("data/Makefile.in" "data/Makefile.am")
-                    (("fonts") ""))
-                  (substitute* "configure"
-                    (("data/fonts/Makefile") "")
-                    (("\\\"data/fonts/Makefile") "# \"data/fonts/Makefile"))
-                  (substitute* '("data/themes/Makefile.in"
-                                 "data/themes/Makefile.am"
-                                 "data/themes/nyanology/Makefile.in"
-                                 "data/themes/nyanology/Makefile.am")
-                    (("-fd \\$\\(top_srcdir\\)/data/fonts") ""))))))
-    (build-system gnu-build-system)
+                  (substitute* "data/meson.build"
+                    (("subdir\\('fonts'\\)") ""))
+                  #t))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -213,6 +207,7 @@ removable devices or support for multimedia.")
            (lambda _ (setenv "HOME" "/tmp") #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
+       ("perl" ,perl)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("efl" ,efl)))