Skip to content

8380959: Update Libpng to 1.6.56#116

Closed
vieiro wants to merge 1 commit intoopenjdk:masterfrom
vieiro:backports/JDK-8380959
Closed

8380959: Update Libpng to 1.6.56#116
vieiro wants to merge 1 commit intoopenjdk:masterfrom
vieiro:backports/JDK-8380959

Conversation

@vieiro
Copy link
Copy Markdown
Contributor

@vieiro vieiro commented Mar 31, 2026

Mostly clean backport of JDK-8380959 from 17u, that makes 11u libpng on par with the upper JDK versions. It would be great if this could make it for the April CPU.

Backport is not clean because of the differences in make/lib/Awt2dLibraries.gmk from JDK17.

Tested on both Fedora 42/gcc 15.2.1 and Windows 10/Visual Studio 2022 and RHEL-8 with the following tests:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk:jdk_imageio                          197   197     0     0   
==============================
TEST SUCCESS

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/java/awt/SplashScreen                  1     1     0     0   
==============================
TEST SUCCESS

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk:jfc_demo                               1     1     0     0   
==============================
TEST SUCCESS

Let's see how this builds on GHA's Visual Studio version, though.


Progress

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

Issue

  • JDK-8380959: Update Libpng to 1.6.56 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 116

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u/pull/116.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Mar 31, 2026

👋 Welcome back avieiro! 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
Copy Markdown

openjdk Bot commented Mar 31, 2026

@vieiro This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8380959: Update Libpng to 1.6.56

Reviewed-by: andrew

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 openjdk Bot changed the title Backport bb6c2196d35bde7061eac321e762f313acad1985 8380959: Update Libpng to 1.6.56 Mar 31, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 31, 2026

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk Bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Mar 31, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge Bot commented Mar 31, 2026

Webrevs

@vieiro
Copy link
Copy Markdown
Contributor Author

vieiro commented Mar 31, 2026

@vieiro
Copy link
Copy Markdown
Contributor Author

vieiro commented Apr 1, 2026

The full GHA tests passed but on macos, but that's unrelated: GHA bumped clang to 17, something we should fix in jdk11u-dev.

Copy link
Copy Markdown
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

As with 17u, looks mostly clean bar copyright header and context differences in the Makefile. Testing looks good.

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Apr 1, 2026

⚠️ @vieiro This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Copy Markdown
Member

The full GHA tests passed but on macos, but that's unrelated: GHA bumped clang to 17, something we should fix in jdk11u-dev.

Ok, I guess running on jdk11u won't make a difference. It looks like we just need to force down the default C standard, a fix we also need on GNU/Linux + 8u with newer gccs. I'll have a look when I'm back at work next week. Do you have actions enabled on your jdk11u fork for future PRs?

@vieiro
Copy link
Copy Markdown
Contributor Author

vieiro commented Apr 1, 2026

Do you have actions enabled on your jdk11u fork for future PRs?

Yep, but looks like his stopped working on 2026-03-20.

@vieiro
Copy link
Copy Markdown
Contributor Author

vieiro commented Apr 1, 2026

/approval request Please consider approving this backport from JDK17u that bumps libpng to the latest version, on par with highter JDK versions. Tested on Fedora/Windows 10 and RHEL-8. Relevant tests pass.

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Apr 1, 2026

@vieiro
8380959: The approval request has been created successfully.

@openjdk openjdk Bot added the approval Requires approval; will be removed when approval is received label Apr 1, 2026
@gnu-andrew
Copy link
Copy Markdown
Member

/approve yes

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Apr 1, 2026

@gnu-andrew
8380959: The approval request has been approved.

@openjdk openjdk Bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Apr 1, 2026
@vieiro
Copy link
Copy Markdown
Contributor Author

vieiro commented Apr 1, 2026

/integrate

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Apr 1, 2026

Going to push as commit 57b1881.

@openjdk openjdk Bot added the integrated Pull request has been integrated label Apr 1, 2026
@openjdk openjdk Bot closed this Apr 1, 2026
@openjdk openjdk Bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 1, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Apr 1, 2026

@vieiro Pushed as commit 57b1881.

💡 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

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants