From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ONywK17xR2M3SwEAbAwnHQ (envelope-from ) for ; Thu, 13 Oct 2022 13:07:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EAa5K17xR2O0CwEA9RJhRA (envelope-from ) for ; Thu, 13 Oct 2022 13:07:10 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 70B0125FF3 for ; Thu, 13 Oct 2022 13:07:10 +0200 (CEST) Received: from localhost ([::1]:50406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiw3R-0007FS-9d for larch@yhetil.org; Thu, 13 Oct 2022 07:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oivKp-0002hm-3k for guix-patches@gnu.org; Thu, 13 Oct 2022 06:21:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oivKo-0005aQ-QE for guix-patches@gnu.org; Thu, 13 Oct 2022 06:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oivKo-0005mE-1Q for guix-patches@gnu.org; Thu, 13 Oct 2022 06:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 10:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58488@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166565646022177 (code B ref -1); Thu, 13 Oct 2022 10:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Oct 2022 10:21:00 +0000 Received: from localhost ([127.0.0.1]:59638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oivKm-0005ld-Ka for submit@debbugs.gnu.org; Thu, 13 Oct 2022 06:21:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:36876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oivKk-0005lV-7t for submit@debbugs.gnu.org; Thu, 13 Oct 2022 06:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oivKf-0002cA-Mz for guix-patches@gnu.org; Thu, 13 Oct 2022 06:20:56 -0400 Received: from mira.cbaines.net ([212.71.252.8]:36754) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oivKe-0005ZL-28 for guix-patches@gnu.org; Thu, 13 Oct 2022 06:20:53 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:fc93:27fb:8412:c8b7]) by mira.cbaines.net (Postfix) with ESMTPSA id 38A3E27BBE9 for ; Thu, 13 Oct 2022 11:20:49 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 691acb91 for ; Thu, 13 Oct 2022 10:20:48 +0000 (UTC) From: Christopher Baines Date: Thu, 13 Oct 2022 11:20:48 +0100 Message-Id: <20221013102048.22966-1-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net 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, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665659230; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3p8iPBdopOxgs8m/L4m3vKSVdJzqwz9E+iCASy9emMo=; b=HXf6tFus+ESPx6jYOQqpkO1yA+fkFKs/MsVlZ1BYNHx1vRMP8SYnYsK2MCtfMEviAzeu/L sS2H1q5woXCWm9QKpM7u8Q2Qiovhy5o0r1z/P1m26ELNOEHVml9NyWP3KCiLptsYcSRh7a wRZGa3iP3dEG+Aj4DVvfOeDRHZ423rizbBTbQRs/hA3ORa781d29gzDftZdAfkmEy5eQO+ BrI8vBlqqdR9AprDK5kq9107OwibHvdR8D/8bqsFborbyeal6TMD+cTAu5sN8nhwSsJmt/ SEX5EY5tHodKB0soSSa0ZjmyjB0vdZ5+yM5uPt9Li2Ls/NnsYp/5xXThLy5P5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665659230; a=rsa-sha256; cv=none; b=HVUfC1l6PCoK7R2wXNq2sqvWznm+J7gyb0WiAdc/1vY3zNXuk6XmPLgeeWdVmBk6hFGMrM 3cj+IPCaEXnD0MJSuu30TsYDmFmu0D4gP8YVVeVXzL+SaaC80VUclKcCjuWD8dRfmpn82K 2871hJCOYP0UA/s5Aw4YErIiEQ7QuzgBHGZ7fKFSXC82guF76s3WcgoD1KYEDcAqFmyEhA Yxwi5y2WNcWzpGTTe7nqeK5wWzOUwr4ILsn6YdEZCCdQqMEGJZVm6/xzBSQzbhNxhxZnVi TlK2XSsPyVMNOOPGKVhNAZvt6oAylf/8tiv54pMc+wa823iYOg5sFbUFj5ItHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 70B0125FF3 X-Spam-Score: -0.10 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2Hu4qAPEKk/+ Since the staging merge, librsvg has been buildable for aarch64. * gnu/packages/gnome.scm (librsvg-for-system): Use librsvg for aarch64. --- gnu/packages/gnome.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09a991b14c..ff9d95c244 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3753,8 +3753,10 @@ (define* (librsvg-for-system #:optional (system (or (%current-target-system) (%current-system)))) ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported - ;; on x86_64 so far, use the ancient C version on other platforms (FIXME). - (if (string-prefix? "x86_64-" system) + ;; on x86_64 and aarch64 so far, use the ancient C version on other + ;; platforms (FIXME). + (if (or (string-prefix? "x86_64-" system) + (string-prefix? "aarch64-" system)) librsvg librsvg-2.40)) -- 2.37.3