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.

Sign up for GitHub

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

Jump to bottom

zlib-ng 2025-01-01 (cbb6ec1d) #5167

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

zlib-ng 2025-01-01 (cbb6ec1d) #5167

wants to merge 3 commits into from

Conversation

dzenanz
Copy link
Member

@dzenanz dzenanz commented Jan 23, 2025

PR Checklist

dzenanz and others added 3 commits January 23, 2025 17:31
@dzenanz
ENH: Change the zlib-ng upstream branch we use from develop to stable
6d163d3
@kwrobot @dzenanz
zlib-ng 2025-01-01 (cbb6ec1d)
48d0365 
Code extracted from:

    https://github.com/zlib-ng/zlib-ng.git

at commit cbb6ec1d74e8061efdf7251f8c2dae778bed14fd (stable).
@dzenanz
Merge branch 'upstream-zlib-ng'
d600679 
# By Zlib-ng Upstream
* upstream-zlib-ng:
  zlib-ng 2025-01-01 (cbb6ec1d)

Some non-trivial merge conflicts were resolved in:
	Modules/ThirdParty/ZLIB/src/itkzlib-ng/CMakeLists.txt
@dzenanz dzenanz requested a review from blowekamp January 23, 2025 22:47
@github-actions github-actions bot added type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots area:ThirdParty Issues affecting the ThirdParty module labels Jan 23, 2025
@dzenanz dzenanz mentioned this pull request Jan 23, 2025
Closed
2 tasks
@dzenanz dzenanz marked this pull request as ready for review January 24, 2025 19:55
@dzenanz
Copy link
Member Author

dzenanz commented Jan 24, 2025

I think we will need to ignore ghostflow's complaints this time. This is ready for review/merge. The only file with manually resolved merge conflicts (https://github.com/InsightSoftwareConsortium/ITK/blob/d600679b63d30bb0e5f2236952076b9cb20fca41/Modules/ThirdParty/ZLIB/src/itkzlib-ng/CMakeLists.txt) is the one to look at. It is hard to look at the right diff from the GitHub UI. Searching for # ITK change can narrow down the focus.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thewtex thewtex thewtex approved these changes

@blowekamp blowekamp Awaiting requested review from blowekamp

Assignees
No one assigned
Labels
area:ThirdParty Issues affecting the ThirdParty module type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dzenanz @thewtex @kwrobot