GNU bug report logs - #58444
Make gtk use librsvg on aarch64 again.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 58444 in the body.
You can then email your comments to 58444 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: bug-guix <at> gnu.org
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Make gtk use librsvg on aarch64 again.
Date: Tue, 11 Oct 2022 17:56:47 +0200

[Message part 1 (text/plain, inline)]

Hi Guix,

Mathieu Othacehe <othacehe <at> gnu.org> writes at <https://issues.guix.gnu.org/57933>:
> That's because `gst-plugins-bad` and `librsvg-bootstrap` both refer to
> `librsvg` which depends on Rust which is only supported on x86_64-linux.

This isn’t entirely true.  Since
32a87714f4507f853824d82d9c6ca10e1405c8eb, bordeaux has substitutes for
librsvg for aarch64.

I wrote a patch but probably it would rebuild the world.  I haven’t
tried compiling yet.  Would using (or (target-aarch64?)
                                      (target-x86-64?)) be better?

[gnu-gtk-Use-recent-librsvg-on-aarch64-again.patch (text/x-patch, inline)]

From: Florian Pelz <pelzflorian <at> pelzflorian.de>
Date: Tue, 11 Oct 2022 16:57:06 +0200
Subject: [PATCH] gnu: gtk: Use recent librsvg on aarch64 again.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 75e24eec1ed9772dbcb6737270076eca571dc4ea assumed librsvg didn’t
support aarch64, but it *is* supported since commit
32a87714f4507f853824d82d9c6ca10e1405c8eb.

* gnu/packages/gtk.scm (gtk)[propagated-inputs]: Check if librsvg is supported.
---
 gnu/packages/gtk.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index faf4d6f7eb..985031c7b2 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
 ;;; Copyright © 2022 Benjamin Slade <slade <at> lambda-y.net>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
+;;; Copyright © 2022 Florian Pelz <pelzflorian <at> pelzflorian.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -969,9 +970,11 @@ (define-public gtk+-2
     (outputs '("out" "bin" "doc" "debug"))
     (propagated-inputs
      (list atk cairo
-           (if (target-x86-64?)
-             librsvg-bootstrap
-             librsvg-2.40)
+           (let ((target (or (%current-target-system)
+                             (%current-system))))
+             (if (supported-package? librsvg-bootstrap target)
+                 librsvg-bootstrap
+                 librsvg-2.40))
            glib pango))
     (inputs
      (list cups

base-commit: 59911ae29442aba18bcb53233e793d8f3d264504
-- 
2.37.3

[Message part 3 (text/plain, inline)]

Regards,
Florian

Message #8 received at 58444 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: 58444 <at> debbugs.gnu.org
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Re: bug#58444: Make gtk use librsvg on aarch64 again.
Date: Tue, 11 Oct 2022 19:45:36 +0200

"pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de> writes:
> I wrote a patch but probably it would rebuild the world.

It does rebuild the world.  I will try with (or (target-aarch64?)
                                                (target-x86-64?)).

Regards,
Florian

Message #11 received at 58444 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: 58444 <at> debbugs.gnu.org
Cc: Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>, control <at> debbugs.gnu.org,
 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Re: bug#58444: Make gtk use librsvg on aarch64 again.
Date: Wed, 12 Oct 2022 21:38:27 +0200

close 58444
thanks

"pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de> writes:
> "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de> writes:
>> I wrote a patch but probably it would rebuild the world.
> It does rebuild the world.  I will try with (or (target-aarch64?)
>                                                 (target-x86-64?)).

My other attempt also caused rebuilds.  Also it's not that important if
gtk+-2 uses an old librsvg.  I had thought GNUtoo's i686 fix (and thank
you for it) introduced a regression for aarch64, but had not noticed how
his use of (target-x86-64?) was a common pattern for e.g. emacs as well.
Perhaps it is better to remove the (target-x86-64?) checks as soon as
mrustc supports i686.

Sorry for the noise.  Closing.

Regards,
Florian

Previous Next

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