-
Notifications
You must be signed in to change notification settings - Fork 6.2k
JDK-8348598 : Update Libpng to 1.6.47 #24021
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
Conversation
|
👋 Welcome back honkar! A progress list of the required criteria for merging this PR into |
|
@honkar-jdk This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 26 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@honkar-jdk The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
| DISABLED_WARNINGS_clang := deprecated-non-prototype, \ | ||
| DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \ | ||
| DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \ | ||
| DISABLED_WARNINGS_clang_png.c := unused-function, \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This warning was disabled to fix the following build issue on linux and macOS.
open/src/java.desktop/share/native/libsplashscreen/libpng/png.c:1558:1: error: 'png_icc_profile_error' defined but not used [-Werror=unused-function]
[2025-03-12T23:57:44,575Z] 1558 | png_icc_profile_error(png_const_structrp png_ptr, png_const_charp name,
[2025-03-12T23:57:44,575Z] | ^~~~~~~~~~~~~~~~~~~~~
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might this be a bug in PNG? All usages of this function are now guarded by "PNG_READ_iCCP_SUPPORTED"? It would be useful to report this upstream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In libconfig.h Ln#120 the undef is commented out - /*#undef PNG_READ_iCCP_SUPPORTED*/ but I don't see it defined.
@prrace do we define it in libconfig.h and remove the warning from disabled section in ClientLibraries.gmk? In Updating.txt , I see a note on libconfig.h, it is heavily modified for JDK and a define stmt can be added on need basis (when there are build failures).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb I see, what you meant is that the function png_icc_profile_error should be guarded with PNG_READ_iCCP_SUPPORTED instead of PNG_iCCP_SUPPORTED. Reported it to upstream - pnggroup/libpng#668
Webrevs
|
prrace
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was surprised by how many changes there are.
|
/integrate |
Yes, it was definitively more compared to last update. |
|
Going to push as commit 6b82b42.
Your commit was automatically rebased without conflicts. |
|
@honkar-jdk Pushed as commit 6b82b42. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Upgraded Libpng to v1.6.47
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24021/head:pull/24021$ git checkout pull/24021Update a local copy of the PR:
$ git checkout pull/24021$ git pull https://git.openjdk.org/jdk.git pull/24021/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24021View PR using the GUI difftool:
$ git pr show -t 24021Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24021.diff
Using Webrev
Link to Webrev Comment