18/62: gnu: gnumeric: Update to 1.12.41.

[guix-commits]

rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.

commit ea4dca3f3461e186b2854f48fb820c19ef524851
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Aug 6 11:17:21 2018 +0200

    gnu: gnumeric: Update to 1.12.41.
    
    * gnu/packages/gnome.scm (gnumeric): Update to 1.12.41.
    [arguments]: Replace build phase "pre-conf" with "fix-build-system".
---
 gnu/packages/gnome.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a2ed47f..133638e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1927,7 +1927,7 @@ Hints specification (EWMH).")
 (define-public gnumeric
   (package
     (name "gnumeric")
-    (version "1.12.36")
+    (version "1.12.41")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1935,7 +1935,7 @@ Hints specification (EWMH).")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0j28qpbz9a9p80x27kcwxl5n1hf36nn2fa7dxwrbhcdx4rgy5grw"))))
+                "0sarasmvx9rqdxj5wpb03ziyzd2w1k8cpn4mf99himxnnxjydxk6"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(;; The gnumeric developers don't worry much about failing tests.
@@ -1943,8 +1943,7 @@ Hints specification (EWMH).")
        #:tests? #f
        #:phases
        (modify-phases %standard-phases
-         (add-before
-          'configure 'pre-conf
+         (add-after 'unpack 'fix-build-system
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Make install tries to write into the directory of goffice
              ;; I am informed that this only affects the possibility to embed a
@@ -1954,7 +1953,15 @@ Hints specification (EWMH).")
                (("^GOFFICE_PLUGINS_DIR=.*")
                 (string-append "GOFFICE_PLUGINS_DIR="
                                (assoc-ref outputs "out")
-                               "/goffice/plugins"))))))))
+                               "/goffice/plugins\n")))
+
+             ;; The relative paths point outside of the build container.
+             (substitute* "plugins/perl-loader/Makefile.in"
+               (("\\$\\(srcdir\\)/../../gnumeric-config.h")
+                "$(top_srcdir)/../build/gnumeric-config.h")
+               (("\\$\\(srcdir\\)/../../src/")
+                "$(top_srcdir)/src/"))
+             #t)))))
     (inputs
      `(("glib" ,glib)
        ("gtk+" ,gtk+)