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] update to 1.3.1 #36395

Merged
merged 6 commits into from
Jan 30, 2024
Merged

[zlib] update to 1.3.1 #36395

merged 6 commits into from
Jan 30, 2024

Conversation

carsten-grimm-at-ipolog
Copy link
Contributor

Fixes #36394.

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

A note regarding the patches:

  • 0002-skip-building-examples.patch is no longer necessary and has been replaced by the build option ZLIB_BUILD_EXAMPLES
  • 0003-build-static-or-shared-not-both.patch has been updated and renamed to 0002-build-static-or-shared-not-both.patch.
  • 0004-android-and-mingw-fixes.patch has been adapted and renamed to 0003-android-and-mingw-fixes.patch

A second pair of eyes on the changes for the patches would be welcome. I aimed to recreate the effect of the existing patches.

sphoto
sphoto reviewed Jan 27, 2024
View reviewed changes
ports/zlib/portfile.cmake
Copy link

Choose a reason for hiding this comment

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

You should remove line 52 (ZLIB_VERSION is already 1.3.1 not 1.3):
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zlib.h" "#define ZLIB_VERSION \"1.3\"" "#define ZLIB_VERSION \"1.3.0\"")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for spotting this. I have removed the workaround.

@MonicaLiu0311 MonicaLiu0311 self-assigned this Jan 29, 2024
@MonicaLiu0311 MonicaLiu0311 added the category:port-update The issue is with a library, which is requesting update new revision label Jan 29, 2024
@carsten-grimm-at-ipolog carsten-grimm-at-ipolog marked this pull request as ready for review January 29, 2024 06:20
@MonicaLiu0311
Copy link
Contributor

The usage test passed on x64-windows (header files found):

The package zlib is compatible with built-in CMake targets:

    find_package(ZLIB REQUIRED)
    target_link_libraries(main PRIVATE ZLIB::ZLIB)

@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Jan 30, 2024
@data-queue data-queue merged commit 7233110 into microsoft:master Jan 30, 2024
16 checks passed
TomKatom pushed a commit to TomKatom/vcpkg that referenced this pull request Feb 23, 2024
@carsten-grimm-at-ipolog @TomKatom
[zlib] update to 1.3.1 (microsoft#36395)
21b70fb 
* [zlib] update to version 1.3.1

* [zlib] adapt patches

* [zlib] regenerate version info

* [zlib] remove version workaround

* [zlib] regenerate version info

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

@sphoto sphoto sphoto left review comments

@MonicaLiu0311 MonicaLiu0311 MonicaLiu0311 approved these changes

@data-queue data-queue data-queue approved these changes

Assignees

@MonicaLiu0311 MonicaLiu0311

Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[zlib] update to 1.3.1
4 participants
@carsten-grimm-at-ipolog @MonicaLiu0311 @sphoto @data-queue