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

Fix shiboken2@5.15.5 patches #345

Merged
merged 1 commit into from
Jul 17, 2022
Merged

Fix shiboken2@5.15.5 patches #345

merged 1 commit into from
Jul 17, 2022

Conversation

plaes
Copy link
Contributor

@plaes plaes commented Jul 17, 2022

Apparently files in shiboken source repository have DOS line endings,
so embed the patches here, and get rid of the broken files.

In case git still manages to mangle the filenames, then patches could be pulled here:

Apparently files in shiboken source repository have DOS line endings,
so embed the patches here, and get rid of the broken files.
@ipatch
Copy link
Collaborator

ipatch commented Jul 17, 2022

thanks for submitting this PR. i'll probably submit another PR after CI checks finish and attempt to update formula to use external patch files. personally i don't like embedding the patches directly in the formula file but if it's the only way we can get this to work then i'll stick with inlining the patches in the formula file.

@ipatch ipatch added the pr-pull label Jul 17, 2022
@ipatch
Copy link
Collaborator

ipatch commented Jul 17, 2022

issue with building bottles due to deletion of bottle block and conflict with revision number but formula builds 🙏 from source. better than what is currently available. will merge anyway to allow fix of broken shiboken2 formula. thanks again for submitting the PR.

@ipatch ipatch merged commit 9102cde into FreeCAD:master Jul 17, 2022
@plaes plaes deleted the shiboken-fix branch July 18, 2022 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants