04/51: gnu: fontforge: Fix build with Python 3.8.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 6e3cbafb60dd55c41dd5cab1f2ccf4077c7cc27a
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 16 08:11:08 2020 +0100

    gnu: fontforge: Fix build with Python 3.8.
    
    * gnu/packages/fontutils.scm (fontforge)[native-inputs]: Add AUTOCONF,
    AUTOMAKE, and LIBTOOL.
    [arguments]: Add phase 'fix-linking-with-python-3.8'.
---
 gnu/packages/fontutils.scm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 34e17fd..1e5ebea 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -585,7 +585,13 @@ definitions.")
              (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
    (build-system gnu-build-system)
    (native-inputs
-    `(("pkg-config" ,pkg-config)))
+    `(("pkg-config" ,pkg-config)
+
+      ;; TODO: Remove these inputs and the 'fix-linking-with-python-3.8' phase
+      ;; below when updating fontforge.
+      ("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("libtool" ,libtool)))
    (inputs `(("cairo"           ,cairo)
              ("fontconfig"      ,fontconfig) ;dlopen'd
              ("freetype"        ,freetype)
@@ -610,6 +616,17 @@ definitions.")
    (arguments
     '(#:phases
       (modify-phases %standard-phases
+        (add-before 'bootstrap 'fix-linking-with-python-3.8
+          (lambda _
+            ;; Applications that embed the Python interpreter are supposed to
+            ;; use the new "python-3.8-embed.pc" pkg-config file starting with
+            ;; Python 3.8.  Adjust the build system accordingly.
+            (substitute* "m4/fontforge_arg_enable.m4"
+              (("python-\"\\$\\{PYTHON_VERSION\\}\"" all)
+               (string-append all "-embed")))
+            ;; Delete the configure script in order to force autoreconf.
+            (delete-file "configure")
+            #t))
         (add-after 'install 'set-library-path
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let ((out (assoc-ref outputs "out"))