Update submodules (PR #26191)
Maarten
Test updating the following submodules:
- libexpat: 2.7.3 → 2.7.4
- libpng: 1.6.52 → 1.6.55
- libjpeg: 9f → 10
- lunasvg: 3.3.0 → 3.5.0
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26191
Commit Summary
- 97c4435 Update submodules
File Changes
(6 files)
- M .gitmodules (16)
- M 3rdparty/lunasvg (2)
- M docs/contributing/how-to-update-third-party-library.md (4)
- M src/expat (2)
- M src/jpeg (2)
- M src/png (2)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26191.patch
- https://github.com/wxWidgets/wxWidgets/pull/26191.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
@MaartenBent pushed 1 commit.
- 7a61f3a fixup
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26191)Nice, thanks!
@Randalphwa I hope updating lunasvg doesn't create any problems?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Randalphwa
Randalphwa left a comment (wxWidgets/wxWidgets#26191)If it was updated directly from the lunasvg project rather than our wxWidgets version, then yes it may break when wxWidgets is built as a static library. I have not tested it recently without the changes to lunasvg.h that I make to ensure it always builds correctly in static/shared/multi-lib/mondo configurations, so I don't know if the version directly from the original repository will work correctly in all situations or not.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#26191)I merged upstream lunasvg into the wx branch. So all your changes are preserved. Including the namespace change, compiler warnings fixes, and static build defines.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26191)Thanks, I'll merge it then — or are you still making more changes to this?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#26191)No, you can't merge it like this. It is pointing to my test branches.
I created the following PR for the submodules. After these are merged I'll update this PR to point to the updated submodules:
- libexpat: wxWidgets/libexpat#11
- libpng: wxWidgets/libpng#11
- libjpeg: wxWidgets/libjpeg-turbo#2
- lunasvg: wxWidgets/lunasvg#5
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26191)Were there any changes needing to be reviewed in the submodules? I don't see anything, but please let me know if I'm missing something.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#26191)These were all straightforward updates:
- Merge the upstream tag (or update the sources in libjpeg case)
- For libpng make the prefix/config files (no changes), for libexpat run buildconf.sh (some minor updates)
- Fix any warnings or issues that appear in CI
The changes in the submodules seem to be just small bugfixes/additions, nothing that should affect wxWidgets.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26191)I've merged the submodule PRs, so this one can be updated now. Thanks again!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26191)Oh, I've just dropped the changes to .gitmodules and will push it as is, hopefully this is fine.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
MaartenBent left a comment (wxWidgets/wxWidgets#26191)I checked the submodule references in the master branch, and they all seem correctly updated 👍
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.