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

Upgrade untwine to 1.4.0 #59160

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Upgrade untwine to 1.4.0 #59160

merged 2 commits into from
Oct 21, 2024

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Oct 21, 2024

Description

Pulling bug fixes and improvements from the latest untwine release:
https://github.com/hobuinc/untwine/releases/tag/1.4.0

@github-actions github-actions bot added this to the 3.40.0 milestone Oct 21, 2024
Copy link

github-actions bot commented Oct 21, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 49b198e)

@nyalldawson nyalldawson merged commit c2dd1aa into qgis:master Oct 21, 2024
27 of 29 checks passed
@m-kuhn
Copy link
Member

m-kuhn commented Oct 22, 2024

This introduced an include problem on Windows, see #59148

D:\a\QGIS\QGIS\external\untwine\untwine\windows\stringconv.hpp(5): fatal error C1083: Cannot open include file: 'untwine/FatalError.hpp': No such file or directory

This include cannot work, the header is in ./external/untwine/untwine/[platform]/stringconv.hpp, not sure how to best solve this. (Well, ideally I would like to see untwine unvendored and consumed as a proper CMake target, but I am not sure that's on any roadmap)

@m-kuhn
Copy link
Member

m-kuhn commented Oct 22, 2024

Sorry, previous assessment was wrong, it's obviously about including untwine/FatalError.hpp which boils down to a missing include dir which is more straightforward to fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants