-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[libxml2] Update to v2.13.5 #42528
[libxml2] Update to v2.13.5 #42528
Conversation
cd8b71d
to
99f1fbd
Compare
99f1fbd
to
6a29fa4
Compare
Update PR 39478 already exists. |
👋 @jimwang118 I’ve been trying to replace our custom registry at https://github.com/WebKitForWindows/WebKitRequirements with the canonical registry. Then I plan on integrating vcpkg into the build of WebKit. I saw your PR but it seemed like you were having trouble with it. I have experience with building libxml2 and libxslt so that’s why I landed an update of the later in 21692b2 . Comparing our two PRs I can see that it’s carrying over some stuff that’s obsolete. Like the pkgconfig specific changes. You can see they added stuff at https://github.com/GNOME/libxml2/blob/fe1ee0f25f43e33a9981fd6fe7b0483a8c8b5e8d/CMakeLists.txt#L385 which does the _LIBS changes. There’s also some commits added since the last release that obsolete some changes in that diff see https://github.com/GNOME/libxml2/commits/2.13/ . There are also a number of build options that aren’t exposed in the feature listing that I was planning on adding to the vcpkg.json. Apologies for not doing a thorough review of your PR making the above points. It’s after work hours for me and it’s hard to do a review through a phone. |
6a29fa4
to
0af4a6f
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
I reran the build to workaround a company-wide authentication issue that broke the first run but the failures now look legitimate: /Users/vcpkg/Data/b/librsvg/src/librsvg-2-a2e28f96fe.clean/rsvg-css.c:866:20: error: incompatible function pointer types assigning to 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct _xmlError *)') from 'void (void *, xmlErrorPtr)' (aka 'void (void *, struct _xmlError *)') [-Wincompatible-function-pointer-types]
handler.serror = rsvg_xml_noerror;
^ ~~~~~~~~~~~~~~~~
1 warning and 1 error generated. It seems likely that |
Yea I think the changes to that port from #39478 need to be integrated. Will give that a go and add @jimwang118 as a co-author. |
0af4a6f
to
6cd4e3d
Compare
Alrighty added and credited @jimwang118 for his work. 🤞 were 🟢 and this can land |
94fe87b
to
94bd8ff
Compare
Also update librsvg version to 2.40.21 and fix the build with the newer lixml2. Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
94bd8ff
to
1517a12
Compare
All features passed with following triplets:
Usage test passed on |
@donny-dont , I think this might have led to build failure on iOS, with the following error: [3/46] /Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc -DLIBXML_STATIC -DSYSCONFDIR="/Users/runner/builddir/_deps/vcpkg-src/packages/libxml2_arm64-ios/etc" -I/Users/runner/builddir/_deps/vcpkg-src/buildtrees/libxml2/arm64-ios-rel -I/Users/runner/builddir/_deps/vcpkg-src/buildtrees/libxml2/src/v2.13.5-a978bfa150.clean/include -isystem /Users/runner/builddir/vcpkg_installed/arm64-ios/include -fPIC -fvisibility=hidden -g -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wno-format-extra-args -O3 -DNDEBUG -arch arm64 -isysroot /Applications/Xcode_15.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk -miphoneos-version-min=14.0 -fPIC -MD -MT CMakeFiles/LibXml2.dir/dict.c.o -MF CMakeFiles/LibXml2.dir/dict.c.o.d -o CMakeFiles/LibXml2.dir/dict.c.o -c /Users/runner/builddir/_deps/vcpkg-src/buildtrees/libxml2/src/v2.13.5-a978bfa150.clean/dict.c |
IMO this is an upstream issue then. IIUC iOS doesn't have |
@dg0yt , most likely yes, see this commit (https://gitlab.gnome.org/GNOME/libxml2/-/commit/e1657f3f272e87577aaf0c77aa040609394a0312). The commit itself doesn't apply against 2.13.5; I've manually backported the commit into a patch locally and if that is successful I'll upstream. |
./vcpkg x-add-version --all
and committing the result.