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

Maintenance: updated vendored minizip code to the version distributed with zlib v1.3.1 #432

Merged
merged 2 commits into from
Feb 3, 2024
Merged

Maintenance: updated vendored minizip code to the version distributed with zlib v1.3.1 #432

merged 2 commits into from
Feb 3, 2024

Conversation

jayaddison
Copy link
Contributor

Updates the vendored copy of minizip within libxlsxwriter to the version distributed with version 1.3.1 of zlib.

The diff here should match with the relevant changes between v1.3 and v1.3.1 of zlib ( madler/zlib@v1.3...v1.3.1 ), with the exception of 1dfd55b that is a cherry-pick already applied locally (#427) from madler/zlib@73331a6 (an upstream fix).

Test results:

  • make test
    • unit tests: 430 passed, 0 failed, 0 skipped.
    • functional tests: 759 passed, 0 failed, 0 skipped.
  • make test_valgrind
    • completed successfully with exit code zero.

(this is a follow-up to issue #419; I'd been awaiting an updated version of zlib and don't plan to track any further releases against that issue number)

@jmcnamara
Copy link
Owner

Thanks.

The ioapi.h and zip.h files also need to be copied into include/xlsxwriter/third_party. After that you may need to change some // style comments to /**/ to fix some warnings. There may be other minor warnings as well. You may see some of the required changes in the diff against the existing code.

@jayaddison
Copy link
Contributor Author

Thanks @jmcnamara - whereabouts do those warnings appear? (to make sure I'm resolving them correctly after the file copy)

@jmcnamara
Copy link
Owner

jmcnamara commented Jan 25, 2024

whereabouts do those warnings appear? (to make sure I'm resolving them correctly after the file copy)

@jayaddison I can't reproduce the warning anymore. Copy the files without changes and if the CI is okay I will merge it.

@jmcnamara jmcnamara merged commit f52d4de into jmcnamara:main Feb 3, 2024
40 checks passed
@jmcnamara
Copy link
Owner

Merged. Thanks.

@jayaddison jayaddison deleted the maintenance/update-zlib-1.3.1 branch February 3, 2024 20:22
@jayaddison
Copy link
Contributor Author

You're welcome - thanks @jmcnamara.

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