From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35247) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1xwV-0002bE-FH for guix-patches@gnu.org; Wed, 12 Feb 2020 14:45:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1xwU-0002R3-8t for guix-patches@gnu.org; Wed, 12 Feb 2020 14:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53110) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1xwU-0002Qw-4I for guix-patches@gnu.org; Wed, 12 Feb 2020 14:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j1xwU-0000wy-3H for guix-patches@gnu.org; Wed, 12 Feb 2020 14:45:02 -0500 Subject: [bug#39146] [PATCH v3] gnu: icecat: Remove about:buildconfig store references. References: <20200115222115.322ymuuqkwlnbl3v@zdrowyportier.kadziolka.net> Resent-Message-ID: Date: Wed, 12 Feb 2020 20:45:25 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200212194525.joyg66cikh5xfnuu@gravity> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tj2tog4cutjlnixn" Content-Disposition: inline In-Reply-To: <1581371371.3276.1@tobias.gr> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39146@debbugs.gnu.org Cc: Mark H Weaver , Marius Bakke , Tobias Geerinckx-Rice , Danny Milosavljevic --tj2tog4cutjlnixn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * gnu/packages/gnuzilla.scm (icecat)[arguments]: New =E2=80=98neutralise-store-references=E2=80=99 phase. Co-authored-by: Tobias Geerinckx-Rice --- On Mon, Feb 10, 2020 at 10:49:31PM +0100, Tobias Geerinckx-Rice wrote: > The truncation of these very long paths was fully intended as a feature, = but > if people do think they're actually useful I think this is a clever hack > worthy of Guix :-) >=20 > Have you tested whether copying & pasting still works fine with this? At the time it was just a rough idea, but here's a patch. After waiting a while for IceCat to compile, I tested this and it's working flawlessly. Selection and copy-paste are unhindered. In the end, I decided to use a comment instead of an empty span, since it'll be less mysterious should someone stumble upon it. It's also more greppable. (to be clear, I only tested the comment version, so perhaps the one wouldn't have even worked. Not that it matters...) BTW, do you happen to know a good way to send a patch as a reply? I ended up using `neomutt -H' and then specifying all the CC's manually... gnu/packages/gnuzilla.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ae0c58eedb..114e5e636c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright =C2=A9 2016 Alex Griffin ;;; Copyright =C2=A9 2017 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2017 ng0 -;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Ivan Petkov ;;; Copyright =C2=A9 2020 Oleg Pykhalov +;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1067,6 +1068,17 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build too= ls in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x= 86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-z]{32})" (%store-directory)) _ st= ore hash) + (string-append store (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. --=20 2.25.0 --tj2tog4cutjlnixn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl5EVdUACgkQ4xWnWEYT FWSAFRAAlkidMV5LWIP8CdFNBzBgriyHcrPxv2utLAoT9rVdK4nnZzwt1h0E5Zv3 dawLf4QMpLrQs+3BqWQsxb/Iu6FGccwDCUhcp5k+yLrm874/3blRp3+e85C3Kzfr 97XKbuMekE7Srg95UX1NjF+ss5QI/q5P1K+pvAWOSDhUo+/D8EpnFeKZyCto05L2 clYrzJht4JSDS9qFXCEWFbF1yHMjqMuNxBeuLwvyC6dhqm5s393wiKhw0PJTnoiy BMPI2B6l7FgVTGCLyhSKt89wa47KVAlMYfVYUaJdQAu7DfJg9T3/c2LBN8pK5FSk 6ltImmRkvNy9KB2qiBlUur62se3EgLceLEtG6J6zMrw913G6vDlsTwqQuWYAq5sQ jhZz1Cy01PiSMyW3B3WcyPT1Hwz3dBUUE5oO5X9zsfb/C5QUEQ/h7jwLHHFsSF05 8x6qW9Wn+DW6S5TliibivNfpFkYAkmsgZ460YoAhtJNx/Fp2D5Y4w3/BwBecoV1g kO9KQaZnJju6Gc3Aun7P8PLXaCnLx0EMG4ZRz8vA0b1EAXJA0QEJqtcm4xN2HDHz 655HG9/J8b7+DKwf8ioIkT94p/5keEZ7GdNSlewwNUA1nsEVTmhIUAYo96w6453C WsPqATBmUzYhbf9fw8+OD+ZHdopezPqZ71Cow7qbwVx5f3CloCE= =4Ojm -----END PGP SIGNATURE----- --tj2tog4cutjlnixn--