Skip to content

Conversation

@honkar-jdk
Copy link
Contributor

@honkar-jdk honkar-jdk commented Mar 13, 2025

Upgraded Libpng to v1.6.47


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24021/head:pull/24021
$ git checkout pull/24021

Update a local copy of the PR:
$ git checkout pull/24021
$ git pull https://git.openjdk.org/jdk.git pull/24021/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24021

View PR using the GUI difftool:
$ git pr show -t 24021

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24021.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 13, 2025

👋 Welcome back honkar! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Mar 13, 2025

@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:

8348598: Update Libpng to 1.6.47

Reviewed-by: azvegint, prr, erikj

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 master branch:

  • 248c373: 8351266: JFR: -XX:StartFlightRecording:report-on-exit
  • 03ef79c: 8346470: Improve WriteBarrier JMH to have old-to-young refs
  • b50fe9b: 8280818: Expand bug8033699.java to iterate over all LaFs
  • 771e160: 8351323: Parameterize compiler and linker flags for iconv
  • 0ff1c08: 8349984: (jdeps) jdeps can use String.repeat instead of String.replaceAll
  • 37ec796: 8351500: G1: NUMA migrations cause crashes in region allocation
  • 4e51a8c: 8307513: C2: intrinsify Math.max(long,long) and Math.min(long,long)
  • 7e3bc81: 8351216: ZGC: Store NUMA node count
  • 82eb780: 8351349: GSSUtil.createSubject has outdated access control context and policy related text
  • c3db667: 8351542: LIBMANAGEMENT_OPTIMIZATION remove special optimization settings
  • ... and 16 more: https://git.openjdk.org/jdk/compare/02c850fca87372173eadba18dfa0231df33bebb0...master

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 master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented Mar 13, 2025

@honkar-jdk The following labels will be automatically applied to this pull request:

  • build
  • client

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.

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Mar 13, 2025
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, \
Copy link
Contributor Author

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]       | ^~~~~~~~~~~~~~~~~~~~~

Copy link
Member

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.

Copy link
Contributor Author

@honkar-jdk honkar-jdk Mar 14, 2025

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).

Copy link
Contributor Author

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

@honkar-jdk honkar-jdk marked this pull request as ready for review March 13, 2025 15:47
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 13, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 13, 2025

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 13, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Mar 13, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 13, 2025
Copy link
Contributor

@prrace prrace left a 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.

@honkar-jdk
Copy link
Contributor Author

/integrate

@honkar-jdk
Copy link
Contributor Author

@prrace

I was surprised by how many changes there are.

Yes, it was definitively more compared to last update.

@openjdk
Copy link

openjdk bot commented Mar 17, 2025

Going to push as commit 6b82b42.
Since your change was applied there have been 55 commits pushed to the master branch:

  • 2674a31: 8351891: Disable TestBreakSignalThreadDump.java#with_jsig and XCheckJSig.java on static JDK
  • 4c6a523: 8352096: Test jdk/jfr/event/profiling/TestFullStackTrace.java shouldn't be executed with -XX:+DeoptimizeALot
  • d68775d: 8351995: JFR: Leftovers from removal of Security Manager
  • e62becc: 8350964: Add an ArtifactResolver.fetch(clazz) method
  • dbf47d6: 8351876: RISC-V: enable and fix some float round tests
  • d207ed3: 8352066: JVM.commit() and JVM.flush() exhibit race conditions against JFR epochs
  • 0450ba9: 8351999: JFR: Incorrect scaling of throttled values
  • e5666f5: 8351976: assert(vthread_epoch == current_epoch) failed: invariant
  • 2eecf15: 8351967: JFR: AnnotationIterator should handle num_annotations = 0
  • c8913d2: 8345555: Improve layout of search results
  • ... and 45 more: https://git.openjdk.org/jdk/compare/02c850fca87372173eadba18dfa0231df33bebb0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 17, 2025
@openjdk openjdk bot closed this Mar 17, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 17, 2025
@openjdk
Copy link

openjdk bot commented Mar 17, 2025

@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.

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

Labels

build build-dev@openjdk.org client client-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants