[PR #432] [MERGED] Maintenance: updated vendored minizip code to the version distributed with zlib v1.3.1 #494

New issue

Closed

opened 2026-05-05 12:17:21 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 12:17:21 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/jmcnamara/libxlsxwriter/pull/432
Author: @jayaddison
Created: 1/25/2024
Status: ✅ Merged
Merged: 2/3/2024
Merged by: @jmcnamara

Base: main ← Head: maintenance/update-zlib-1.3.1

📝 Commits (2)

1317399 Apply diff-patch of zlib-distributed minizip code (v1.3 to v1.3.1) to vendored minizip
7768201 Copy minizip header files to third-party include dir

📊 Changes

10 files changed (+39 additions, -25 deletions)

View changed files

📝 include/xlsxwriter/third_party/ioapi.h (+5 -5)
📝 include/xlsxwriter/third_party/zip.h (+3 -3)
📝 third_party/minizip/Makefile.orig (+1 -1)
📝 third_party/minizip/configure.ac (+1 -1)
📝 third_party/minizip/ioapi.h (+1 -1)
📝 third_party/minizip/miniunz.c (+16 -2)
📝 third_party/minizip/unzip.c (+4 -4)
📝 third_party/minizip/unzip.h (+1 -1)
📝 third_party/minizip/zip.c (+5 -5)
📝 third_party/minizip/zip.h (+2 -2)

📄 Description

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 ( https://github.com/madler/zlib/compare/v1.3...v1.3.1 ), with the exception of 1dfd55bf17 that is a cherry-pick already applied locally (#427) from madler/zlib@73331a6a04 (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)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/jmcnamara/libxlsxwriter/pull/432 **Author:** [@jayaddison](https://github.com/jayaddison) **Created:** 1/25/2024 **Status:** ✅ Merged **Merged:** 2/3/2024 **Merged by:** [@jmcnamara](https://github.com/jmcnamara) **Base:** `main` ← **Head:** `maintenance/update-zlib-1.3.1` --- ### 📝 Commits (2) - [`1317399`](https://github.com/jmcnamara/libxlsxwriter/commit/131739901e56f6f85ef55de6c399100a185ad088) Apply diff-patch of zlib-distributed minizip code (v1.3 to v1.3.1) to vendored minizip - [`7768201`](https://github.com/jmcnamara/libxlsxwriter/commit/7768201ce070f27c3832726f0e1b50fe92b66e19) Copy minizip header files to third-party include dir ### 📊 Changes **10 files changed** (+39 additions, -25 deletions) <details> <summary>View changed files</summary> 📝 `include/xlsxwriter/third_party/ioapi.h` (+5 -5) 📝 `include/xlsxwriter/third_party/zip.h` (+3 -3) 📝 `third_party/minizip/Makefile.orig` (+1 -1) 📝 `third_party/minizip/configure.ac` (+1 -1) 📝 `third_party/minizip/ioapi.h` (+1 -1) 📝 `third_party/minizip/miniunz.c` (+16 -2) 📝 `third_party/minizip/unzip.c` (+4 -4) 📝 `third_party/minizip/unzip.h` (+1 -1) 📝 `third_party/minizip/zip.c` (+5 -5) 📝 `third_party/minizip/zip.h` (+2 -2) </details> ### 📄 Description Updates the vendored copy of `minizip` within `libxlsxwriter` to the version [distributed with version 1.3.1 of zlib](https://github.com/madler/zlib/tree/51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf/contrib/minizip). The diff here should match with the relevant changes between v1.3 and v1.3.1 of `zlib` ( https://github.com/madler/zlib/compare/v1.3...v1.3.1 ), with the exception of 1dfd55bf17434fb5b4530597343129acbda71806 that is a cherry-pick already applied locally (#427) from madler/zlib@73331a6a0481067628f065ffe87bb1d8f787d10c (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) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>