GNU bug report logs - #39410
[PATCH] gnu: netsurf: Fix entity parsing.

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 39410 in the body.
You can then email your comments to 39410 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: Eric Bavier <bavier <at> member.fsf.org>
To: guix-patches <at> gnu.org
Cc: Eric Bavier <bavier <at> posteo.net>
Subject: [PATCH] gnu: netsurf: Fix entity parsing.
Date: Mon,  3 Feb 2020 23:06:09 -0600

From: Eric Bavier <bavier <at> posteo.net>

From: Eric Bavier <bavier <at> member.fsf.org>

Follow-up to commit 31afa654c58cd7aa8bd11a771fa6eabcd766d443.

* gnu/packages/web.scm (netsurf)[arguments]: In 'adjust-welcome' phase, ensure
html entities are parsed and find their way back to the output.
---
 gnu/packages/web.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f6ae958ae3..60fd5cfd0f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo <at> gmail.com>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli <at> gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Eric Bavier <bavier <at> member.fsf.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <bavier <at> posteo.net>
 ;;; Copyright © 2015 Eric Dvorsak <eric <at> dvorsak.fr>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong <at> gmail.com>
 ;;; Copyright © 2016 Jelle Licht <jlicht <at> fsfe.org>
@@ -5075,12 +5075,19 @@ w3c webidl files and a binding configuration file.")
                  ;; Leave the DOCTYPE header as is.
                  (display (read-line in 'concat) out)
                  (sxml->xml
-                  (let rec ((sxml (xml->sxml in)))
+                  (let rec ((sxml (xml->sxml in
+					     #:default-entity-handler
+					     (lambda (port name)
+					       (string-append "<ENTITY>"
+							      (symbol->string name)
+							      "</ENTITY>")))))
                     ;; We'd like to use sxml-match here, but it can't
                     ;; match against generic tag symbols...
                     (match sxml
                       (`(div (@ (class "links")) . ,rest)
                        '())
+		      (`(ENTITY ,ent)
+		       `(*ENTITY* ,ent))
                       ((x ...)
                        (map rec x))
                       (x x)))
-- 
2.25.0

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

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Eric Bavier <bavier <at> member.fsf.org>
Cc: 39410 <at> debbugs.gnu.org, Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#39410] [PATCH] gnu: netsurf: Fix entity parsing.
Date: Tue, 4 Feb 2020 13:02:28 +0200

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

I assume this fixes building netsurf on master. Any idea why netsurf
builds on core-updates without this patch?


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 39410-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Eric Bavier <bavier <at> member.fsf.org>
Cc: 39410-done <at> debbugs.gnu.org, Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#39410] [PATCH] gnu: netsurf: Fix entity parsing.
Date: Tue, 4 Feb 2020 14:25:26 +0200

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

On Tue, Feb 04, 2020 at 01:02:28PM +0200, Efraim Flashner wrote:
> I assume this fixes building netsurf on master. Any idea why netsurf
> builds on core-updates without this patch?

I take it back, with the recent merging of master into core-updates
netsurf failed to build for me.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Previous Next

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