Subject: bug#70546: closed (Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 13 May 2024 16:38:02 +0000

Your bug report

#70546: [PATCH] gnu: cairo: Fix cross-compilation.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
70546: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70546
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.
From: Zheng Junjie <[email-masked]>
To: Ludovic Courtès <[email-masked]>
Cc: [email-masked], Vivien Kraus <[email-masked]>, Liliana Marie Prikler <[email-masked]>, Maxim Cournoyer <[email-masked]>
Date: Tue, 14 May 2024 00:37:16 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Ludovic Courtès <[email-masked]> writes:

> Hi,
>
> Zheng Junjie <[email-masked]> skribis:
>
>> * gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
>> when cross-compiling.
>>
>> Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
>
> [...]
>
>> +       ,@(if (%current-target-system)
>> +             `(#:phases
>> +               (modify-phases %standard-phases
>> +                 (add-after 'unpack 'fix-cross-compilation
>> +                   (lambda _
>> +                     ;; XXX: Let meson-build-system can customize the property
>
> s/can customize/customize/
>
>> +                     (substitute* "meson.build"
>> +                       (("'ipc_rmid_deferred_release', 'auto'")
>> +                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
>> +                        ;; XXX: check it on hurd.
>> +                        "'ipc_rmid_deferred_release', 'true'"))))))
>> +             '())))
>
> Otherwise LGTM, thanks!
>
> Ludo’.

Thanks, push at https://git.savannah.gnu.org/cgit/guix.git/commit/?id=ecfd88cbe34551ebdae92c7c6bb5888bbd0993d6

Subject: [PATCH] gnu: cairo: Fix cross-compilation.
From: Zheng Junjie <[email-masked]>
To: [email-masked]
Date: Wed, 24 Apr 2024 11:17:18 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/gtk.scm (cairo)[arguments]: When
cross-compilation, Add fix-cross-compile phase.

Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
---
 gnu/packages/gtk.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b0098e780e..8fcd3ed1f3 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <[email-masked]>
 ;;; Copyright © 2022 Petr Hodina <[email-masked]>
 ;;; Copyright © 2023 Sergiu Ivanov <[email-masked]>
-;;; Copyright © 2023 Zheng Junjie <[email-masked]>
+;;; Copyright © 2023, 2024 Zheng Junjie <[email-masked]>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2024 John Kehayias <[email-masked]>
 ;;;
@@ -182,7 +182,19 @@ (define cairo
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
        #:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dtests=disabled")))
+       (list "-Dtests=disabled")
+       ,@(if (%current-target-system)
+             `(#:phases
+               (modify-phases %standard-phases
+                 (add-after 'unpack 'fix-cross-compile
+                   (lambda _
+                     ;; XXX: Let meson-build-system can customize the property
+                     (substitute* "meson.build"
+                       (("'ipc_rmid_deferred_release', 'auto'")
+                        ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
+                        ;; XXX: check it on hurd.
+                        "'ipc_rmid_deferred_release', 'true'"))))))
+             '())))
     (native-inputs
      `(,@(if (target-hurd?)
              '()

base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068
-- 
2.41.0