Subject: [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling.

From: Liliana Marie Prikler <[email-masked]>
Date: Sat, 11 Nov 2023 17:10:07 +0100

Am Samstag, dem 11.11.2023 um 23:30 +0800 schrieb Zheng Junjie:
> * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling.
> [arguments]<#:configure-flags>: when cross-compiling, disable
> gobject-introspection.
When.
> [native-inputs]: when cross-compiling, add gdk-pixbuf.
When.

> (librsvg-for-system): Use the C version when cross-compiling.
You don't need a newline here afaik.

> Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc
> ---
>  gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index ac3035e07d..c5006993c8 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -77,6 +77,7 @@
>  ;;; Copyright © 2023 Juliana Sims <[email-masked]>
>  ;;; Copyright © 2023 Dominik Delgado Steuter <[email-masked]>
>  ;;; Copyright © 2023 Zhu Zihao <[email-masked]>
> +;;; Copyright © 2023 Zheng Junjie <[email-masked]>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -3663,7 +3664,10 @@ (define-public librsvg-2.40
>                 
> "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
>      (build-system gnu-build-system)
>      (arguments
> -     `(#:configure-flags (list "--disable-static")
> +     `(#:configure-flags (list "--disable-static"
> +                               ,@(if (%current-target-system)
> +                                     '("--enable-introspection=no")
> +                                     '()))
Can we do --disable-introspection?
>         #:phases
>         (modify-phases %standard-phases
>           (add-before 'configure 'pre-configure
> @@ -3674,7 +3678,7 @@ (define-public librsvg-2.40
>                 (("gdk_pixbuf_moduledir = .*$")
>                  (string-append "gdk_pixbuf_moduledir = "
>                                 "$(prefix)/lib/gdk-pixbuf-
> 2.0/2.10.0/"
> -                                "loaders\n"))
> +                               "loaders\n"))
>                 ;; Drop the 'loaders.cache' file, it's in gdk-
> pixbuf+svg.
>                 (("gdk_pixbuf_cache_file = .*$")
>                  "gdk_pixbuf_cache_file =
> $(TMPDIR)/loaders.cache\n"))
> @@ -3702,9 +3706,12 @@ (define-public librsvg-2.40
>                             "bugs/340047.svg"
>                             "bugs/749415.svg"))))))))
>      (native-inputs
> -     (list pkg-config
> -           `(,glib "bin") ; glib-mkenums, etc.
> -           gobject-introspection)) ; g-ir-compiler, etc.
> +     (append (if (%current-target-system)
> +                 (list gdk-pixbuf)
> +                 '())
> +             (list pkg-config
> +                   `(,glib "bin") ; glib-mkenums, etc.
> +                   gobject-introspection))) ; g-ir-compiler, etc.
Instead of doing append, you can quasiquote the list and use ,@ to
splice in gdk-pixbuf.
>      (inputs
>       (list pango libcroco libxml2))
>      (propagated-inputs
> @@ -3714,14 +3721,16 @@ (define-public librsvg-2.40
>      (properties '((hidden? . #t)))))
>  
>  (define* (librsvg-for-system #:optional
> -                             (system (or (%current-target-system)
> -                                         (%current-system))))
> +                             (system (%current-system)))
Why this change?
>    ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly
> supported
>    ;; on x86_64, aarch64 and riscv64 so far, use the ancient C
> version on other
>    ;; platforms (FIXME).
> -  (if (supported-package? librsvg)
> -      librsvg
> -      librsvg-2.40))
> +  ;; and for now cargo-build-system is no support cross-compiling,
> so when
> +  ;; cross-compiling we just use C version.
> +  (if (or (%current-target-system)
> +          (not (supported-package? librsvg system)))
> +      librsvg-2.40
> +      librsvg))
This hunk LGTM.

Cheers