From unknown Sun Jul 27 00:54:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#67108 <67108@debbugs.gnu.org> To: bug#67108 <67108@debbugs.gnu.org> Subject: Status: [PATCH] gnu: librsvg-2.40: Fix cross-compiling. Reply-To: bug#67108 <67108@debbugs.gnu.org> Date: Sun, 27 Jul 2025 07:54:43 +0000 retitle 67108 [PATCH] gnu: librsvg-2.40: Fix cross-compiling. reassign 67108 guix-patches submitter 67108 Zheng Junjie severity 67108 normal tag 67108 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 11 10:32:38 2023 Received: (at submit) by debbugs.gnu.org; 11 Nov 2023 15:32:38 +0000 Received: from localhost ([127.0.0.1]:53769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1pyP-0001aT-NM for submit@debbugs.gnu.org; Sat, 11 Nov 2023 10:32:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1pyN-0001aE-4w for submit@debbugs.gnu.org; Sat, 11 Nov 2023 10:32:36 -0500 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 ) id 1r1pxc-0000GY-Oa for guix-patches@gnu.org; Sat, 11 Nov 2023 10:31:48 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1r1pxY-0000Kc-Uv for guix-patches@gnu.org; Sat, 11 Nov 2023 10:31:48 -0500 Received: from localhost.localdomain (unknown [183.247.5.45]) by APP-03 (Coremail) with SMTP id rQCowABnbZVSnk9lJQ9hBA--.36289S2; Sat, 11 Nov 2023 23:31:31 +0800 (CST) From: Zheng Junjie To: guix-patches@gnu.org Subject: [PATCH] gnu: librsvg-2.40: Fix cross-compiling. Date: Sat, 11 Nov 2023 23:30:24 +0800 Message-ID: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowABnbZVSnk9lJQ9hBA--.36289S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j 6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV WUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU4VbkUUUUU X-Originating-IP: [183.247.5.45] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling. [arguments]<#:configure-flags>: when cross-compiling, disable gobject-introspection. [native-inputs]: when cross-compiling, add gdk-pixbuf. (librsvg-for-system): Use the C version when cross-compiling. 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 ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; 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") + '())) #: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. (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))) ;; 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)) (export librsvg-for-system) base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 11 11:11:03 2023 Received: (at 67108) by debbugs.gnu.org; 11 Nov 2023 16:11:03 +0000 Received: from localhost ([127.0.0.1]:54187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1qZa-0008N6-HS for submit@debbugs.gnu.org; Sat, 11 Nov 2023 11:11:03 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:55345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1qZX-0008MY-1V for 67108@debbugs.gnu.org; Sat, 11 Nov 2023 11:11:01 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9e1fb7faa9dso482993066b.2 for <67108@debbugs.gnu.org>; Sat, 11 Nov 2023 08:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699719013; x=1700323813; 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=VedAr9wSjcfUMLwVi2lHrQaycF1zcSkwL5dio99pjXY=; b=RGm+bNi136ONDpfiWOfnJQzwlMQIcFqsQ7wnUKkLjG2qvOet7vteubGMD973N9Yuwi bZ5oLpA/80LPHRDZQQsEmLvJrzY4d2SEBp3VQJzK+Zh6NM9JIIjHCz0H6f8A92Oy2wZY ALG9UGTqW3yZrhtSXvtUsc51KkoDiIU0qcsN8h8MQVaXRyE4zbMf6DM9dFRq4gT+l4/Z /wG+EGTxmz9FX0jThx8gxqa6UM77Fw+qfAqrWBj2D4eYPVLEq+kizdoxFbeGZoNtn8oc tQc99WK8Fjw1YOqd4SyT8a1iHQhFXE+DTGQ+w1fSBLlxRMy50s2tyES5UcdYJeGewdsp fD1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699719013; x=1700323813; 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=VedAr9wSjcfUMLwVi2lHrQaycF1zcSkwL5dio99pjXY=; b=qoM6K5PwuJKXLu/KMtD1y73gQ0e5No56wvHcrS+dyNdZvAsWVttdzQ7cStCCOwAy3z NTw2w0zsNGl8XNOtXC4BIQTN1BjC4iatmiB4fSisODg5SvuovArtgPy+KoWBLJcoCXPB i8EQ5fPgHAcbDWJbRaNSkrMHqrew5Tb+3ROFYOo0X3x5/nvKXja6VCs4IN/7Z6xDoOMC 5pX8rQWQ4rVskZZbPNiMULHApd48bXpUGBalbiDs9QRTWD1S0cUvBC607LVzWqK/wXwU 4t0gglJG88MR++O6k33SaOe7NDUr6U9IdTIOijpSFSLkOSBm9Nw87oQq6L2Z2Mshpn+B cl8w== X-Gm-Message-State: AOJu0YzApFgQxOwblad0cnN4kkm6zR7dsg0R/+ERhvkLB21pAe/QDJC2 BUZ3JmlXKrO3SQsxKxVB6Ns= X-Google-Smtp-Source: AGHT+IHmG9NS3slPwd9fOs2VKYGQ2aVq15LgdDNN57s2OHVVCy6yncMqNV7HXUDwdrKUfDpzfDKhZA== X-Received: by 2002:a17:906:5245:b0:9e5:2b1f:13f4 with SMTP id y5-20020a170906524500b009e52b1f13f4mr1406392ejm.42.1699719012533; Sat, 11 Nov 2023 08:10:12 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k24-20020a17090627d800b009e5f8dcfdd4sm1270152ejc.17.2023.11.11.08.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 08:10:10 -0800 (PST) Message-ID: <635b85f155a3bf447d916b21defb2a6fc4d6110f.camel@gmail.com> Subject: Re: [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling. From: Liliana Marie Prikler To: Zheng Junjie , 67108@debbugs.gnu.org Date: Sat, 11 Nov 2023 17:10:07 +0100 In-Reply-To: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> References: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67108 Cc: Raghav Gururajan , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU2Ftc3RhZywgZGVtIDExLjExLjIwMjMgdW0gMjM6MzAgKzA4MDAgc2NocmllYiBaaGVuZyBK dW5qaWU6Cj4gKiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIChsaWJyc3ZnLTIuNDApOiBGaXggY3Jv c3MtY29tcGlsaW5nLgo+IFthcmd1bWVudHNdPCM6Y29uZmlndXJlLWZsYWdzPjogd2hlbiBjcm9z cy1jb21waWxpbmcsIGRpc2FibGUKPiBnb2JqZWN0LWludHJvc3BlY3Rpb24uCldoZW4uCj4gW25h dGl2ZS1pbnB1dHNdOiB3aGVuIGNyb3NzLWNvbXBpbGluZywgYWRkIGdkay1waXhidWYuCldoZW4u Cgo+IChsaWJyc3ZnLWZvci1zeXN0ZW0pOiBVc2UgdGhlIEMgdmVyc2lvbiB3aGVuIGNyb3NzLWNv bXBpbGluZy4KWW91IGRvbid0IG5lZWQgYSBuZXdsaW5lIGhlcmUgYWZhaWsuCgo+IENoYW5nZS1J ZDogSWNiOTU3NjM0MjIyNjllZWQyZTA2N2ExZDA2MTY2YzNlZDRiZGVlZGMKPiAtLS0KPiDCoGdu dS9wYWNrYWdlcy9nbm9tZS5zY20gfCAyOSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQo+ IMKgMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQo+IAo+ IGRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ25vbWUuc2NtIGIvZ251L3BhY2thZ2VzL2dub21l LnNjbQo+IGluZGV4IGFjMzAzNWUwN2QuLmM1MDA2OTkzYzggMTAwNjQ0Cj4gLS0tIGEvZ251L3Bh Y2thZ2VzL2dub21lLnNjbQo+ICsrKyBiL2dudS9wYWNrYWdlcy9nbm9tZS5zY20KPiBAQCAtNzcs NiArNzcsNyBAQAo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIEp1bGlhbmEgU2ltcyA8anVsaUBp bmNhbmEub3JnPgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIERvbWluaWsgRGVsZ2FkbyBTdGV1 dGVyIDxkQGRlbGdhZG8ubnJ3Pgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIFpodSBaaWhhbyA8 YWxsX2J1dF9sYXN0QDE2My5jb20+Cj4gKzs7OyBDb3B5cmlnaHQgwqkgMjAyMyBaaGVuZyBKdW5q aWUgPDg3MzIxNjA3MUBxcS5jb20+Cj4gwqA7OzsKPiDCoDs7OyBUaGlzIGZpbGUgaXMgcGFydCBv ZiBHTlUgR3VpeC4KPiDCoDs7Owo+IEBAIC0zNjYzLDcgKzM2NjQsMTAgQEAgKGRlZmluZS1wdWJs aWMgbGlicnN2Zy0yLjQwCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAiMWZs amthZzJncjdjNGs1bW43OThsZ2Y5OTAzeHNsejhoNTFiZ3ZsODlubmF5NDJxanFwcCIpKSkpCj4g wqDCoMKgwqAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQo+IMKgwqDCoMKgIChhcmd1 bWVudHMKPiAtwqDCoMKgwqAgYCgjOmNvbmZpZ3VyZS1mbGFncyAobGlzdCAiLS1kaXNhYmxlLXN0 YXRpYyIpCj4gK8KgwqDCoMKgIGAoIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgIi0tZGlzYWJsZS1z dGF0aWMiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAsQChpZiAoJWN1cnJlbnQtdGFyZ2V0LXN5c3RlbSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgICcoIi0tZW5hYmxlLWludHJvc3BlY3Rpb249bm8iKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg JygpKSkKQ2FuIHdlIGRvIC0tZGlzYWJsZS1pbnRyb3NwZWN0aW9uPwo+IMKgwqDCoMKgwqDCoMKg ICM6cGhhc2VzCj4gwqDCoMKgwqDCoMKgwqAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNl cwo+IMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWJlZm9yZSAnY29uZmlndXJlICdwcmUtY29uZmln dXJlCj4gQEAgLTM2NzQsNyArMzY3OCw3IEBAIChkZWZpbmUtcHVibGljIGxpYnJzdmctMi40MAo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJnZGtfcGl4YnVmX21vZHVsZWRpciA9 IC4qJCIpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQg Imdka19waXhidWZfbW9kdWxlZGlyID0gIgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIkKHByZWZpeCkvbGliL2dkay1waXhi dWYtCj4gMi4wLzIuMTAuMC8iCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJsb2FkZXJzXG4iKSkKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJsb2FkZXJz XG4iKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgRHJvcCB0aGUgJ2xvYWRl cnMuY2FjaGUnIGZpbGUsIGl0J3MgaW4gZ2RrLQo+IHBpeGJ1ZitzdmcuCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICgoImdka19waXhidWZfY2FjaGVfZmlsZSA9IC4qJCIpCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImdka19waXhidWZfY2FjaGVfZmlsZSA9Cj4g JChUTVBESVIpL2xvYWRlcnMuY2FjaGVcbiIpKQo+IEBAIC0zNzAyLDkgKzM3MDYsMTIgQEAgKGRl ZmluZS1wdWJsaWMgbGlicnN2Zy0yLjQwCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJidWdzLzM0MDA0Ny5zdmciCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJidWdzLzc0OTQxNS5z dmciKSkpKSkpKSkKPiDCoMKgwqDCoCAobmF0aXZlLWlucHV0cwo+IC3CoMKgwqDCoCAobGlzdCBw a2ctY29uZmlnCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoLGdsaWIgImJpbiIpIDsgZ2xpYi1t a2VudW1zLCBldGMuCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgIGdvYmplY3QtaW50cm9zcGVjdGlv bikpIDsgZy1pci1jb21waWxlciwgZXRjLgo+ICvCoMKgwqDCoCAoYXBwZW5kIChpZiAoJWN1cnJl bnQtdGFyZ2V0LXN5c3RlbSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxp c3QgZ2RrLXBpeGJ1ZikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgJygpKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxpc3QgcGtnLWNvbmZpZwo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgsZ2xpYiAiYmluIikgOyBnbGliLW1rZW51bXMs IGV0Yy4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGdvYmplY3QtaW50 cm9zcGVjdGlvbikpKSA7IGctaXItY29tcGlsZXIsIGV0Yy4KSW5zdGVhZCBvZiBkb2luZyBhcHBl bmQsIHlvdSBjYW4gcXVhc2lxdW90ZSB0aGUgbGlzdCBhbmQgdXNlICxAIHRvCnNwbGljZSBpbiBn ZGstcGl4YnVmLgo+IMKgwqDCoMKgIChpbnB1dHMKPiDCoMKgwqDCoMKgIChsaXN0IHBhbmdvIGxp YmNyb2NvIGxpYnhtbDIpKQo+IMKgwqDCoMKgIChwcm9wYWdhdGVkLWlucHV0cwo+IEBAIC0zNzE0 LDE0ICszNzIxLDE2IEBAIChkZWZpbmUtcHVibGljIGxpYnJzdmctMi40MAo+IMKgwqDCoMKgIChw cm9wZXJ0aWVzICcoKGhpZGRlbj8gLiAjdCkpKSkpCj4gwqAKPiDCoChkZWZpbmUqIChsaWJyc3Zn LWZvci1zeXN0ZW0gIzpvcHRpb25hbAo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3lzdGVtIChvciAoJWN1cnJlbnQtdGFyZ2V0LXN5 c3RlbSkKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCVjdXJyZW50LXN5c3RlbSkpKSkKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHN5c3RlbSAoJWN1cnJlbnQtc3lzdGVtKSkpCldoeSB0aGlzIGNoYW5nZT8KPiDCoMKgIDs7IFNp bmNlIGxpYnJzdmcgMi41MCBkZXBlbmRzIG9uIFJ1c3QsIGFuZCBSdXN0IGlzIG9ubHkgY29ycmVj dGx5Cj4gc3VwcG9ydGVkCj4gwqDCoCA7OyBvbiB4ODZfNjQsIGFhcmNoNjQgYW5kIHJpc2N2NjQg c28gZmFyLCB1c2UgdGhlIGFuY2llbnQgQwo+IHZlcnNpb24gb24gb3RoZXIKPiDCoMKgIDs7IHBs YXRmb3JtcyAoRklYTUUpLgo+IC3CoCAoaWYgKHN1cHBvcnRlZC1wYWNrYWdlPyBsaWJyc3ZnKQo+ IC3CoMKgwqDCoMKgIGxpYnJzdmcKPiAtwqDCoMKgwqDCoCBsaWJyc3ZnLTIuNDApKQo+ICvCoCA7 OyBhbmQgZm9yIG5vdyBjYXJnby1idWlsZC1zeXN0ZW0gaXMgbm8gc3VwcG9ydCBjcm9zcy1jb21w aWxpbmcsCj4gc28gd2hlbgo+ICvCoCA7OyBjcm9zcy1jb21waWxpbmcgd2UganVzdCB1c2UgQyB2 ZXJzaW9uLgo+ICvCoCAoaWYgKG9yICglY3VycmVudC10YXJnZXQtc3lzdGVtKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqAgKG5vdCAoc3VwcG9ydGVkLXBhY2thZ2U/IGxpYnJzdmcgc3lzdGVtKSkpCj4g K8KgwqDCoMKgwqAgbGlicnN2Zy0yLjQwCj4gK8KgwqDCoMKgwqAgbGlicnN2ZykpClRoaXMgaHVu ayBMR1RNLgoKQ2hlZXJzCg== From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 12 03:21:15 2023 Received: (at 67108) by debbugs.gnu.org; 12 Nov 2023 08:21:15 +0000 Received: from localhost ([127.0.0.1]:55063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r25iU-0000Rt-Qy for submit@debbugs.gnu.org; Sun, 12 Nov 2023 03:21:15 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:55750 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r25iS-0000Rd-21 for 67108@debbugs.gnu.org; Sun, 12 Nov 2023 03:21:14 -0500 Received: from localhost.localdomain (unknown [112.10.199.33]) by APP-01 (Coremail) with SMTP id qwCowAAXzDD7iVBlEhmeBA--.34958S2; Sun, 12 Nov 2023 16:17:00 +0800 (CST) From: Zheng Junjie To: 67108@debbugs.gnu.org Subject: [PATCH v2] gnu: librsvg-2.40: Fix cross-compiling. Date: Sun, 12 Nov 2023 16:19:36 +0800 Message-ID: <9010adfa43b7bffa2514ffea582f28bf3448efc8.1699777176.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: qwCowAAXzDD7iVBlEhmeBA--.34958S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [112.10.199.33] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67108 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling. [arguments]<#:configure-flags>: When cross-compiling, disable gobject-introspection. [native-inputs]: When cross-compiling, add gdk-pixbuf. (librsvg-for-system): Use the C version when cross-compiling. Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc --- gnu/packages/gnome.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac3035e07d..b832ff1099 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; 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) + '("--disable-introspection") + '())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure @@ -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. + `(,pkg-config + ,@(if (%current-target-system) + (list gdk-pixbuf) + '()) + (,glib "bin") ; glib-mkenums, etc. + ,gobject-introspection)) ; g-ir-compiler, etc. (inputs (list pango libcroco libxml2)) (propagated-inputs @@ -3719,9 +3726,12 @@ (define* (librsvg-for-system #:optional ;; 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)) (export librsvg-for-system) base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 21 04:29:03 2023 Received: (at 67108-done) by debbugs.gnu.org; 21 Dec 2023 09:29:03 +0000 Received: from localhost ([127.0.0.1]:42388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGFMU-0002sI-QF for submit@debbugs.gnu.org; Thu, 21 Dec 2023 04:29:03 -0500 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]:61775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGFMT-0002re-FY for 67108-done@debbugs.gnu.org; Thu, 21 Dec 2023 04:29:02 -0500 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-50e3845abdaso756334e87.3 for <67108-done@debbugs.gnu.org>; Thu, 21 Dec 2023 01:28:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703150931; x=1703755731; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=b3idlIC0fDe2zefZg4rsR5w7WLc3ZlcDfLDNH/yUYP8=; b=ftEA4HyfX0rXwNkcMjoFST1WJbWhVNJBet3+JQwfNcf8xqHYTHpp+LKs6flm5NqbvP mRgb5XAsjs2UsE4SzL4066yme8pzhBVjyluVtCn5aKLceubbqHYgciA+9SOFX9KRIBbV RCJg/OobZ38EE1SwmIUZQV6St+M0xZ2XFfkJMjV0d4YR+zG6Y28DVUhLQAAWJw+bLzln S+sqioA1ptigpSf7/UUOZQqPZNDu/az6iDOCjDMaBTt5BaSTPHRZfR9aF6wv/+oVoNMX jkTGhbtwvmY1AsUiKLxNVTfPh2EGJHCYrIlWyiS72A/SUkyOdbn7UVTe1EyTxsGDwk/Q DQ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703150931; x=1703755731; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b3idlIC0fDe2zefZg4rsR5w7WLc3ZlcDfLDNH/yUYP8=; b=TP3xA/YDPy0A98+4nSEQV0F9IIFgwYaEYJWeX0ABaUA8S1OzRitL5FjZRyi4JOxPoG 8PZAf6HAg3e5YwwXAEtx5tAJCQLygubVLHvogrPNk4Up3CcYdHwi48Fjj0PXftNp6q1h 1yH3z9THLqajhj+TYLH/bzdog7MEvttAcKBsFErYkPMtDErZ5REIh1Or/pTt9eJ0ufL7 SMsU0ZLGv1fISXxf4uLX14h9k90HksWPGqgA4wKIAeHXgtALjuw95FNjNW7mLNsdOG9G WTLxjC/z4icW1WavTPFCdSQ7OW1xp3ky5UV44App9ltNq8dz9KmzWqo359DTCYvSHRnT vOZA== X-Gm-Message-State: AOJu0YwMUcKlOUTsrLyumxWEPOzKBzfM2rxzNRlSN8zmsENUct/1OK+F XPCzilqbSOhsD6iYlJ5iius= X-Google-Smtp-Source: AGHT+IEOkrPdSEtjce6RzD1vqy2szsxFIrlJCjPhU++7OKrHsombrl5Ojcgike1qj6OpZyfC98owvQ== X-Received: by 2002:ac2:4c25:0:b0:50e:61a8:7715 with SMTP id u5-20020ac24c25000000b0050e61a87715mr210809lfq.100.1703150931178; Thu, 21 Dec 2023 01:28:51 -0800 (PST) Received: from localhost ([5.102.238.170]) by smtp.gmail.com with ESMTPSA id y8-20020a056000108800b0033642a9a1eesm1574864wrw.21.2023.12.21.01.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 01:28:50 -0800 (PST) Date: Thu, 21 Dec 2023 11:28:49 +0200 From: Efraim Flashner To: Zheng Junjie Subject: Re: [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling. Message-ID: Mail-Followup-To: Efraim Flashner , Zheng Junjie , 67108-done@debbugs.gnu.org, Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan References: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RWk2T6mWO7ClC+1/" Content-Disposition: inline In-Reply-To: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67108-done Cc: Raghav Gururajan , 67108-done@debbugs.gnu.org, Liliana Marie Prikler , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --RWk2T6mWO7ClC+1/ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 11, 2023 at 11:30:24PM +0800, Zheng Junjie wrote: > * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling. > [arguments]<#:configure-flags>: when cross-compiling, disable > gobject-introspection. > [native-inputs]: when cross-compiling, add gdk-pixbuf. >=20 > (librsvg-for-system): Use the C version when cross-compiling. With the rust-team branch merged there's now support for cross-compiling librsvg so this patch shouldn't be needed anymore. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --RWk2T6mWO7ClC+1/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmWEBVEACgkQQarn3Mo9 g1Eiwg/+MIO5Og+6Rr65ZsgcMrAySMrOwiWnWr7hoPOnQVY08EsRaUEEmN/wdrTp yTprXXf7OK9qHrabharxvu+0EySHNWdy77y2gCwgfC52FCXw37nMr6g8hHrt3Y5k kJdMCcg1pOD9mdEppYimATKhxa1PAJ7UDTPsnWf3cOWH3L+qK3U7E7x7pXQ+rw6M EIa8111MM279ZBdt/XdEP4hIrG1q8UzwMYklpFGp8QkBnGjlySmeXuAhVoZTadoO 7Td8qTpgdaLkQWUgaBu4k6ZbduD+27PMdQDJn3/lx2BX59IyzmjFOz/pJhw2e/kQ hhVTW6L4Bbo845f42U11/cCbGKv33K97WFTmfLiWlfa8Bo5l9S+Lx7TF2TFZPDmb Q8s+uKZt6GM8smxL/LZeTp37HQEx+dsvnDjQHKY30kdrktgmADn7Wu2l3iYJbfg4 vrQ4CFcgOC3sF0AE9zlotC9G7EUofdH2Qzuhp8oSzuu/8aD9hFXIkul460NoMxwF 27Vu0tu0Js4TwsbO+kVhFPqGlpy8o3ogGK0H+TY5/t3bBGVo829ILi9GEo6v11uN uaX/Q8YF7UxyetVL/9EAaII/0tyfz0Rr7AS0dxCQ5b8lfccvcaaIlIZLp04MIu4Q ATVjnlzWtse+I8Zcp9td+TtlSXeBkU1lTRMmKzOom0RL5opEZh0= =kgs1 -----END PGP SIGNATURE----- --RWk2T6mWO7ClC+1/-- From unknown Sun Jul 27 00:54:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 18 Jan 2024 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator