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

zlib/minizip: Update to version 1.3 #81111

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Aug 29, 2023

Upstreams the fix from #73310, so we can remove that patch. Remove infback.c which we stopped compiling after #79273. (Note for 3.x cherrypick: that file should be removed from core/SCsub too.)

The OF macro was also removed so I can drop the patch where I yell at Gentoo developers.

Would be nice if we could look at upstreaming the seek functionality we added to minizip, so that we no longer need to rely on a hard fork and can compile Godot against distro minizip too.

Upstreams the fix from godotengine#73310, so we can remove that patch.
Remove `infback.c` which we stopped compiling after godotengine#79273.

The `OF` macro was also removed so I can drop the patch where I yell
at Gentoo developers.
@akien-mga akien-mga added enhancement topic:thirdparty cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Aug 29, 2023
@akien-mga akien-mga added this to the 4.2 milestone Aug 29, 2023
@akien-mga akien-mga requested a review from a team as a code owner August 29, 2023 09:03
Copy link
Member

@RedworkDE RedworkDE left a comment

Choose a reason for hiding this comment

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

Not sure how reviewing 3rd party update are normally supposed to work, but the changed files look expected, it still compiles and appears to still work correctly, so I guess this looks good to me.

@akien-mga akien-mga merged commit a47729d into godotengine:master Sep 1, 2023
15 checks passed
@akien-mga akien-mga deleted the zlib-1.3 branch September 1, 2023 14:11
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Oct 24, 2023
@YuriSizov
Copy link
Contributor

YuriSizov commented Oct 24, 2023

Cherry-picked for 4.1.3.

@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jan 18, 2024
@akien-mga akien-mga added the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Jan 30, 2024
@akien-mga
Copy link
Member Author

Cherry-picked for 3.5.4.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Jan 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants