amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* gnu/packages/fontutils.scm (fontforge): Update to 20230101.
[arguments]: Add stage "do-not-use-msgfmt--check".

Change-Id: I2e4e347e86a32963ac7b927be3bc9235dc326fd6
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-10 22:39:42 +01:00 • committed by Andreas Enge
parent 1900a22eb3
commit a81eb98484
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/fontutils.scm
View file

@ -1685,14 +1685,14 @@ definitions.")
(define-public fontforge (define-public fontforge
(package (package
(name "fontforge") (name "fontforge")
(version "20220308") (version "20230101")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/fontforge/fontforge/releases/download/" "https://github.com/fontforge/fontforge/releases/download/"
version "/fontforge-" version ".tar.xz")) version "/fontforge-" version ".tar.xz"))
(sha256 (sha256
(base32 "0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01")))) (base32 "1y30bk9rdya8bkw4q77y6nq5xfg7nm0qliz5miqdlk8c0r6fr0na"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -1720,7 +1720,7 @@ definitions.")
zlib)) zlib))
(arguments (arguments
(list (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. ;; backend, instead of the legacy X11 backend.
;; Currently it introduces a circular dependency. ;; Currently it introduces a circular dependency.
"-DENABLE_X11=ON") "-DENABLE_X11=ON")
@ -1733,6 +1733,12 @@ definitions.")
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)") (("^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?) #$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch #~((add-after 'unpack 'apply-hurd-patch
(lambda _ (lambda _