2034221 - Clean up a couple lingering issues from the Cairo 1.18.4 update

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

jimb noticed after the 1.18.4 update landed that the refreshed patches don't actually apply cleanly in series to the 1.18.4 source. The issue was a defect in the patches, not the actual vendored changes thankfully. I've prepared revised patches for that and also standardized their commit metadata to make them easier for future import in case we decide to keep them on a forked branch from upstream for future library updates.

While I was looking into that issue, I also noticed that the vendoring only updated the files under /src and didn't get a few other miscellaneous files, so I fixed that too.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 2034221 - Refresh cairo 1.18.4 local patch series. r=jimb

All 26 patches now apply cleanly (zero offset/fuzz/rejects) to pristine
cairo 1.18.4. Patch 25 is regenerated against the correct base
(pristine + 00-24) and expanded to cover all six quartz files from
bugs 1901043/1908587/1970983. Patch 15 drops its cairo-features.h hunk
since that file is Mozilla-maintained.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 2034221 - Refresh cairo 1.18.4 top-level vendored files. r=jimb

The 1.18.4 source bump touched only src/; refresh the top-level files
that were left at 1.18.0 state: BUGS, HACKING, NEWS, README.md,
meson.build, and meson-cc-tests/ (drop ft_has_color.c, add
atomic-ops-c11.c).

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/31c7b17720d5
https://hg.mozilla.org/integration/autoland/rev/9626ee7bfb6a
Refresh cairo 1.18.4 local patch series. r=jimb
https://github.com/mozilla-firefox/firefox/commit/0585cdbe0b5f
https://hg.mozilla.org/integration/autoland/rev/5642129cc1b6
Refresh cairo 1.18.4 top-level vendored files. r=jimb

Comment 4

[Andy Leiserson [:aleiserson]]

Attachment: Bug 2034221 - Reconcile a few more differences from upstream r=jimb,ryanvm

Comment 5

[amarc]

https://hg.mozilla.org/mozilla-central/rev/9626ee7bfb6a
https://hg.mozilla.org/mozilla-central/rev/5642129cc1b6

Comment 6

[Andy Leiserson [:aleiserson]]

There is still an error in the patch stack that seems like a merge issue with bug 2023419. See https://phabricator.services.mozilla.com/D296230.

Comment 7

[Andy Leiserson [:aleiserson]]

The patch stack is fixed as of https://phabricator.services.mozilla.com/D297243.