bug#39410: closed ([PATCH] gnu: netsurf: Fix entity parsing.)

[GNU bug Tracking System]

Your message dated Tue, 4 Feb 2020 14:25:26 +0200
with message-id <20200204122526.GH19864@E5400>
and subject line Re: [bug#39410] [PATCH] gnu: netsurf: Fix entity parsing.
has caused the debbugs.gnu.org bug report #39410,
regarding [PATCH] gnu: netsurf: Fix entity parsing.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
39410: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39410
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: netsurf: Fix entity parsing.
>
>
>
>
> Date: 
>
> Mon,  3 Feb 2020 23:06:09 -0600
>
>
>
>
> From: Eric Bavier <address@hidden>
>
> From: Eric Bavier <address@hidden>
>
> 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 <address@hidden>
>  ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <address@hidden>
>  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Eric Bavier <address@hidden>
> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier <address@hidden>
>  ;;; Copyright © 2015 Eric Dvorsak <address@hidden>
>  ;;; Copyright © 2016 Sou Bunnbu <address@hidden>
>  ;;; Copyright © 2016 Jelle Licht <address@hidden>
> @@ -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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#39410] [PATCH] gnu: netsurf: Fix entity parsing. Date: Tue, 4 Feb 2020 14:25:26 +0200

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   <address@hidden>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

signature.asc
Description: PGP signature

--- End Message ---