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 Windows build #1017

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Fix Windows build #1017

merged 1 commit into from
Nov 29, 2024

Conversation

acolwell
Copy link
Collaborator

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

Various fixes to get the Windows build working again. The changes are simply responding to changes in the MSYS2 build environment and the update to python 3.12

  • Add a dependency on mingw-w64-x86_64-pkg-config since the installer script depends on it.

  • Fix libraw package build by removing an export to a directory that does not exist.

  • Remove distutils from list of directories to copy in python zip since distutils was removed in python 3.12

  • Add zipfile module to python zip since get-pip requires it now.

Have you tested your changes (if applicable)? If so, how?

Yes. Verified pacman repo builds again (https://github.com/acolwell/Natron/actions/runs/12072707931) and verified that the Windows installer builds (https://github.com/acolwell/Natron/actions/runs/12074140306). I did minor manual testing of the installer built to verify things were still working.

- Add a dependency on mingw-w64-x86_64-pkg-config since the installer
  script depends on it.

- Fix libraw package build by removing an export to a directory
  that does not exist.

- Remove distutils from list of directories to copy in python zip
  since distutils was removed in python 3.12

- Add zipfile module to python zip since get-pip requires it now.
Copy link
Member

@devernay devernay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@acolwell acolwell merged commit 8326245 into NatronGitHub:RB-2.6 Nov 29, 2024
4 checks passed
@acolwell acolwell deleted the fix_nightly_build branch November 29, 2024 15:48
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.

2 participants