Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fails with libxml2 version 2.12.0 due to API change #20741

Merged

Conversation

aperezdc
Copy link
Contributor

@aperezdc aperezdc commented Nov 20, 2023

1bad176

Build fails with libxml2 version 2.12.0 due to API change
https://bugs.webkit.org/show_bug.cgi?id=265128

Reviewed by Philippe Normand.

Starting with libxml2 2.12.0, the API has changed the const-ness of the
xmlError pointers, which results in a build error due to a mismatched
type in the parsing error callback. This papers over the difference by
using preprocessor conditionals.

* Source/WebCore/xml/XSLTProcessor.h: Use const when building against
  libxml2 2.12.0 or newer.
* Source/WebCore/xml/XSLTProcessorLibxslt.cpp:
(WebCore::XSLTProcessor::parseErrorFunc): Ditto.

Canonical link: https://commits.webkit.org/270977@main

5677728

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug   πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  gtk
βœ… πŸ§ͺ api-ios   πŸ§ͺ mac-wk2   πŸ§ͺ gtk-wk2
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@aperezdc aperezdc self-assigned this Nov 20, 2023
@aperezdc aperezdc added the XML For bugs in XML support other than XML DOM, including XSLT, XMLHTTPRequest, XML Parsing, etc. label Nov 20, 2023
@aperezdc aperezdc added the merge-queue Applied to send a pull request to merge-queue label Nov 20, 2023
https://bugs.webkit.org/show_bug.cgi?id=265128

Reviewed by Philippe Normand.

Starting with libxml2 2.12.0, the API has changed the const-ness of the
xmlError pointers, which results in a build error due to a mismatched
type in the parsing error callback. This papers over the difference by
using preprocessor conditionals.

* Source/WebCore/xml/XSLTProcessor.h: Use const when building against
  libxml2 2.12.0 or newer.
* Source/WebCore/xml/XSLTProcessorLibxslt.cpp:
(WebCore::XSLTProcessor::parseErrorFunc): Ditto.

Canonical link: https://commits.webkit.org/270977@main
@webkit-commit-queue
Copy link
Collaborator

Committed 270977@main (1bad176): https://commits.webkit.org/270977@main

Reviewed commits have been landed. Closing PR #20741 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 1bad176 into WebKit:main Nov 20, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 20, 2023
@aperezdc aperezdc deleted the eng/libxml2-xmlerror-constness branch November 21, 2023 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
XML For bugs in XML support other than XML DOM, including XSLT, XMLHTTPRequest, XML Parsing, etc.
Projects
None yet
4 participants