GNU bug report logs - #70546
[PATCH] gnu: cairo: Fix cross-compilation.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Zheng Junjie <zhengjunjie@HIDDEN>; Keywords: patch; dated Wed, 24 Apr 2024 03:19:03 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 70546 <at> debbugs.gnu.org:


Received: (at 70546) by debbugs.gnu.org; 13 May 2024 12:47:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 13 08:47:48 2024
Received: from localhost ([127.0.0.1]:60796 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6V5o-00041b-IC
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 08:47:48 -0400
Received: from eggs.gnu.org ([209.51.188.92]:55272)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1s6V5m-00041T-N3
 for 70546 <at> debbugs.gnu.org; Mon, 13 May 2024 08:47:47 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1s6V5f-0006vI-Uj; Mon, 13 May 2024 08:47:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=2J1H37ukhCyQWXUKQheLLhhAtU8XN5jPvtjOe5f8yCI=; b=rtQ+d7Ys+huMY8HNpt7i
 d+Po650pmSzJ6A8b48wpY3QQNTiLTxeJzmtux+v5Zz5R/d+x3j8cWtDm6oxO6ucAFg5oL7KTU1pDk
 7GSN6J9XVPVab2A2mFGw0XzAKXv13bEl8ug3ERZqvSlQfQvWcWzBoRZjaYF1heN9kuZWaNt6GnrxQ
 +R3OUqiDnNrp3QAA9dFyB0cEielXXoBZoFAq/DibETt4DmBtWQZ6vXd19Wr4z/r75IMhxsMx2g8Ok
 WSvyREJTj6/HXkm9OI0ZN1ZMHKRkD7F36RPxz4LSKOHpuhZXnkv0m/bmS9+czMP2WRADXfFzW4o0X
 5yNW3bh5mtdNbg==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Zheng Junjie <zhengjunjie@HIDDEN>
Subject: Re: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation.
In-Reply-To: <e7e54c3b1fa933c57ceddcb2c2524cdcd5154fad.1713933265.git.zhengjunjie@HIDDEN>
 (Zheng Junjie's message of "Wed, 24 Apr 2024 12:34:25 +0800")
References: <c496085ed765e3e8cc037c0f9fa86d79b9871bf4.1713928638.git.zhengjunjie@HIDDEN>
 <e7e54c3b1fa933c57ceddcb2c2524cdcd5154fad.1713933265.git.zhengjunjie@HIDDEN>
Date: Mon, 13 May 2024 14:47:37 +0200
Message-ID: <87jzjxanfa.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70546
Cc: Vivien Kraus <vivien@HIDDEN>,
 Liliana Marie Prikler <liliana.prikler@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>, 70546 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi,

Zheng Junjie <zhengjunjie@HIDDEN> skribis:

> * gnu/packages/gtk.scm (cairo)[arguments]: Add =E2=80=98fix-cross-compila=
tion=E2=80=99 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 pr=
operty

s/can customize/customize/

> +                     (substitute* "meson.build"
> +                       (("'ipc_rmid_deferred_release', 'auto'")
> +                        ;; see https://github.com/NixOS/nixpkgs/blob/df5=
1f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/defa=
ult.nix#L65
> +                        ;; XXX: check it on hurd.
> +                        "'ipc_rmid_deferred_release', 'true'"))))))
> +             '())))

Otherwise LGTM, thanks!

Ludo=E2=80=99.
Information forwarded to guix-patches@HIDDEN:
bug#70546; Package guix-patches. Full text available.

Message received at 70546 <at> debbugs.gnu.org:


Received: (at 70546) by debbugs.gnu.org; 24 Apr 2024 04:35:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 24 00:35:08 2024
Received: from localhost ([127.0.0.1]:56254 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rzULX-0006bV-FG
	for submit <at> debbugs.gnu.org; Wed, 24 Apr 2024 00:35:08 -0400
Received: from smtp21.cstnet.cn ([159.226.251.21]:52266 helo=cstnet.cn)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1rzULR-0006Yb-N7
 for 70546 <at> debbugs.gnu.org; Wed, 24 Apr 2024 00:35:02 -0400
Received: from m.tailaa68d.ts.net (unknown [183.247.5.102])
 by APP-01 (Coremail) with SMTP id qwCowAAnbs7TiyhmE_ywBQ--.11395S2;
 Wed, 24 Apr 2024 12:34:27 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 70546 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: cairo: Fix cross-compilation.
Date: Wed, 24 Apr 2024 12:34:25 +0800
Message-ID: <e7e54c3b1fa933c57ceddcb2c2524cdcd5154fad.1713933265.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
 Vivien Kraus <vivien@HIDDEN>
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: qwCowAAnbs7TiyhmE_ywBQ--.11395S2
X-Coremail-Antispam: 1UD129KBjvJXoW7WF43WFWxZF4UXrW8Gry7Awb_yoW8Cr18pF
 Z7Gr4q93WfXrWkKanxt3W09an0qas3Ga4UXwn7Aa15tr4F9ry2krWjqrWfWF12yrn7u3yf
 W3WSgFn5GF45JaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2
 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw
 A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII
 jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV
 C2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC
 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr
 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2
 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI
 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE
 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20x
 vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8
 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8P5r7UUUUU==
X-Originating-IP: [183.247.5.102]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70546
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

* gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
when cross-compiling.

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..678bc89378 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -34,7 +34,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
 ;;; Copyright © 2022 Petr Hodina <phodina@HIDDEN>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@HIDDEN>
-;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@HIDDEN>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN>
 ;;;
@@ -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-compilation
+                   (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
Information forwarded to liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN:
bug#70546; Package guix-patches. Full text available.

Message received at 70546 <at> debbugs.gnu.org:


Received: (at 70546) by debbugs.gnu.org; 24 Apr 2024 04:19:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 24 00:19:28 2024
Received: from localhost ([127.0.0.1]:56193 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rzU6S-0003gS-2W
	for submit <at> debbugs.gnu.org; Wed, 24 Apr 2024 00:19:28 -0400
Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:57588)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <liliana.prikler@HIDDEN>) id 1rzU6M-0003ec-6M
 for 70546 <at> debbugs.gnu.org; Wed, 24 Apr 2024 00:19:26 -0400
Received: by mail-wm1-x341.google.com with SMTP id
 5b1f17b1804b1-4155819f710so53680625e9.2
 for <70546 <at> debbugs.gnu.org>; Tue, 23 Apr 2024 21:19:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1713932339; x=1714537139; darn=debbugs.gnu.org;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject
 :date:message-id:reply-to;
 bh=HN2SK0e+3sxqbMTPSfmQLidXv8hoZ4h7mwBFigxszN0=;
 b=B6KOqyVDYg3rjjuJEO8wBcelYFGBKDxmKQtS0EXPh4gjKzgUNgeMSVOl4gxphcc8cC
 PMqP8z5DvTVmSKCCzUlM3sjchRoaAdqnL+B+KBexXuQoymCXicXs3Efz3diAVc/DVgM2
 rhjES0PxdrGwXqm7+X2NN4H9GI3sBuIztWx38imavz7tp+bJ+tjIO2iBr+6hO9xONAbK
 3ISy9QO9DHoA3uuwEcCAucbZKn5DSWl1tF26hJsLkb52MFOO4c173CUbHUX56h94em9r
 7K7/z1/c98V+2/oe3Fp9cf9sZvL3HjzDOnmdsSduJghALPn6qFzNWvWytJStMH/9mH/z
 vcDg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1713932339; x=1714537139;
 h=mime-version:user-agent:content-transfer-encoding:references
 :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state
 :from:to:cc:subject:date:message-id:reply-to;
 bh=HN2SK0e+3sxqbMTPSfmQLidXv8hoZ4h7mwBFigxszN0=;
 b=WHODGatHE7TCFw8+wAiWd7265UGbB0AwJubbcqQ5CQ1kS+14IgwJvfmPCE+ewiqeem
 6hvofEoXNoTsHZ5RWEGy/gtlZN5wir5yy/24GTmcqMfM6QwQpzdaHnl7Qr1wSyIeSdUP
 bvz+3SmDZI0Kh/w3tDZnxA9Fttc7hzRgAS+CtlmaESq8ucMQzG0/r++8WozYpntmrjhz
 +Rq8dol8rDS/zaIUXSEzEphRlNqL95GtoVrf0izrHBWxRDrWSKH9zR66xRcc91qhfKqN
 /U/D/ldr22DnoUfdgZfZ5WMQ+rWCMVMpUXYonh6ehmvc+23vRDO80g3yG05NZ+jOSEfD
 NlMQ==
X-Forwarded-Encrypted: i=1;
 AJvYcCUjCCy7qeHh8mYbD9tDu8AMOGqR8tUAfZBDX4eYWJIBe7G0dpS+FbEj/+y3SdwNdKR2GkNLlJuG24GHeyINjv6iJIQxKyM=
X-Gm-Message-State: AOJu0YwGkhzLNiDXZagsc+YqxKoEmVjFrxfYmmlYJ/vC3lKtLc6b15zs
 avk41w12lOdRUTle1tilxQMSYKPdGA2zQNE9f1NziC6RsElNCMsQ
X-Google-Smtp-Source: AGHT+IHFNOCaEkiP0a+5TgJXrzc84UWOeTFh0KTT85m/bTMEUNgbMUGq8/4nL2JdsR5nRyt71Vv0Kg==
X-Received: by 2002:a5d:44c7:0:b0:34a:d5e:afd2 with SMTP id
 z7-20020a5d44c7000000b0034a0d5eafd2mr715096wrr.4.1713932339123; 
 Tue, 23 Apr 2024 21:18:59 -0700 (PDT)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
 [85.127.52.93]) by smtp.gmail.com with ESMTPSA id
 dl14-20020a170907944e00b00a559aae2ea0sm5141211ejc.104.2024.04.23.21.18.58
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 23 Apr 2024 21:18:58 -0700 (PDT)
Message-ID: <ecc1fb038795ddab619748497f3120a59bc882f5.camel@HIDDEN>
Subject: Re: [bug#70546] [PATCH] gnu: cairo: Fix cross-compilation.
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Zheng Junjie <zhengjunjie@HIDDEN>, 70546 <at> debbugs.gnu.org
Date: Wed, 24 Apr 2024 06:18:56 +0200
In-Reply-To: <c496085ed765e3e8cc037c0f9fa86d79b9871bf4.1713928638.git.zhengjunjie@HIDDEN>
References: <c496085ed765e3e8cc037c0f9fa86d79b9871bf4.1713928638.git.zhengjunjie@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 
MIME-Version: 1.0
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70546
Cc: Vivien Kraus <vivien@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Am Mittwoch, dem 24.04.2024 um 11:17 +0800 schrieb Zheng Junjie:
> * gnu/packages/gtk.scm (cairo)[arguments]: When
> cross-compilation, Add fix-cross-compile phase.
>=20
> Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
> ---
Haven't checked that it works yet, but at least lexically it LGTM.
For the commit message =E2=80=93 particularly the ChangeLog portion =E2=80=
=93 I'd say
"Add =E2=80=98fix-cross-compilation=E2=80=99 phase when cross-compiling." a=
nd adjust
the phase name accordingly.

Cheers
Information forwarded to guix-patches@HIDDEN:
bug#70546; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 24 Apr 2024 03:18:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 23 23:18:08 2024
Received: from localhost ([127.0.0.1]:55952 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rzT92-00033X-MJ
	for submit <at> debbugs.gnu.org; Tue, 23 Apr 2024 23:18:07 -0400
Received: from lists.gnu.org ([2001:470:142::17]:53908)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1rzT8w-00031U-V6
 for submit <at> debbugs.gnu.org; Tue, 23 Apr 2024 23:18:02 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1rzT8a-00085B-A6
 for guix-patches@HIDDEN; Tue, 23 Apr 2024 23:17:36 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn)
 by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1rzT8X-0007Gh-6u
 for guix-patches@HIDDEN; Tue, 23 Apr 2024 23:17:36 -0400
Received: from m.tailaa68d.ts.net (unknown [183.247.5.102])
 by APP-05 (Coremail) with SMTP id zQCowAB3fgLAeShmxHi9BQ--.30032S2;
 Wed, 24 Apr 2024 11:17:22 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: cairo: Fix cross-compilation.
Date: Wed, 24 Apr 2024 11:17:18 +0800
Message-ID: <c496085ed765e3e8cc037c0f9fa86d79b9871bf4.1713928638.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
 Vivien Kraus <vivien@HIDDEN>
Content-Type: text/plain; charset=y
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAB3fgLAeShmxHi9BQ--.30032S2
X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73
 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK
 xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw
 A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I
 6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26r
 4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvE
 ncxIr21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx
 v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l
 F7xvr2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I
 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK
 xVWUJVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV
 AFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8I
 cIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r
 4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU
X-Originating-IP: [183.247.5.102]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
Received-SPF: pass client-ip=159.226.251.84;
 envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* 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 <GNUtoo@HIDDEN>
 ;;; Copyright © 2022 Petr Hodina <phodina@HIDDEN>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@HIDDEN>
-;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@HIDDEN>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN>
 ;;;
@@ -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
Acknowledgement sent to Zheng Junjie <zhengjunjie@HIDDEN>:
New bug report received and forwarded. Copy sent to liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN. Full text available.
Report forwarded to liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN:
bug#70546; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Mon, 13 May 2024 13:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.