2062946 - Fix parser/expat local patches to apply

Status: RESOLVED FIXED

(Core :: XML, defect)

Comment 1

[Timothy Nikkel (:tnikkel)]

Attachment: Bug 2062946. Fix the path in expat's 13_high_surrogate_mask.patch. r?mccr8,hsivonen

The patch added in bug 2053153 names the file it changes expat/expat/lib/xmltok.c,
with expat/ doubled, while the other thirteen expat patches use expat/lib/... . The
patches are applied with patch -p1 --directory parser/expat, so patch could not find
a file at that path, skipped the whole patch and counted its hunk as ignored. The
change was in the tree anyway, so nothing looked wrong, but re-vendoring expat dropped
it and left upstream's mask, and the next update of expat would have done the same.

With this, ./mach vendor parser/expat/moz.yaml -r R_2_8_2 --patch-mode check --force
reproduces the committed tree exactly.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/52c45c2701a3
https://hg.mozilla.org/integration/autoland/rev/be3c20dbc02a
Fix the path in expat's 13_high_surrogate_mask.patch. r=hsivonen

Comment 3

[Andrew McCreight [:mccr8]]

I guess this is sort of a regression but there's no need to backport it as it only affects updating the patches. Also, bug 2062690 will soon delete this patch entirely.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

Yep, I have the 2.8.3 update up for review but can rebase on top of this.

Comment 5

[Sandor Molnar[:smolnar]]

https://hg.mozilla.org/mozilla-central/rev/be3c20dbc02a

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 2062946. Fix the path in expat's 13_high_surrogate_mask.patch.

The patch added in bug 2053153 names the file it changes expat/expat/lib/xmltok.c,
with expat/ doubled, while the other thirteen expat patches use expat/lib/... . The
patches are applied with patch -p1 --directory parser/expat, so patch could not find
a file at that path, skipped the whole patch and counted its hunk as ignored. The
change was in the tree anyway, so nothing looked wrong, but re-vendoring expat dropped
it and left upstream's mask, and the next update of expat would have done the same.

With this, ./mach vendor parser/expat/moz.yaml -r R_2_8_2 --patch-mode check --force
reproduces the committed tree exactly.

Original Revision: https://phabricator.services.mozilla.com/D318092

Comment 7

[Pulsebot]

https://hg.mozilla.org/releases/mozilla-esr153/rev/fde2e9c885f5