36/290: gnu: fontforge: Update to 20230101 and fix build with gettext-0.23.

[guix-commits]

andreas pushed a commit to branch core-packages-team
in repository guix.

commit 01f3cf71339b146d0d6b07ea2e1b61d440e491f2
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 10 22:39:42 2024 +0100

    gnu: fontforge: Update to 20230101 and fix build with gettext-0.23.
    
    * gnu/packages/fontutils.scm (fontforge): Update to 20230101.
    [arguments]: Add stage "do-not-use-msgfmt--check".
    
    Change-Id: I2e4e347e86a32963ac7b927be3bc9235dc326fd6
---
 gnu/packages/fontutils.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 7d101bebff..a85477e25a 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1622,14 +1622,14 @@ definitions.")
 (define-public fontforge
   (package
     (name "fontforge")
-    (version "20220308")
+    (version "20230101")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://github.com/fontforge/fontforge/releases/download/";
                     version "/fontforge-" version ".tar.xz"))
               (sha256
-               (base32 
"0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01"))))
+               (base32 
"1y30bk9rdya8bkw4q77y6nq5xfg7nm0qliz5miqdlk8c0r6fr0na"))))
     (build-system cmake-build-system)
     (native-inputs
      (list pkg-config))
@@ -1657,7 +1657,7 @@ definitions.")
            zlib))
     (arguments
      (list
-      #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
+      #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK
                             ;; backend, instead of the legacy X11 backend.
                             ;; Currently it introduces a circular dependency.
                             "-DENABLE_X11=ON")
@@ -1670,6 +1670,12 @@ definitions.")
               (substitute* "CMakeLists.txt"
                 (("^set_default_rpath\\(\\)")
                  ""))))
+          (add-after 'unpack 'do-not-use-msgfmt--check
+            (lambda _
+              ;; msgfmt --check from gettext-0.23 fails on fr.po:
+              ;; 'msgstr' is not a valid C format string
+              (substitute* "po/CMakeLists.txt"
+                ((" --check") ""))))
           #$@(if (target-hurd?)
                  #~((add-after 'unpack 'apply-hurd-patch
                       (lambda _