8295685: Update Libpng to 1.6.38

[martinuy]

Hi all,

This pull request contains a backport of commit d183dc25f7360c3012726acf8c03874df6fc41a4 from the openjdk/jdk11u-dev repository.

This backport is a follow up fix of JDK-8209115, and a dependency of JDK-8305815.

This backport applied cleanly, except for the changes to the THIRD_PARTY_README files that are specific to 8u.

Note: Changes to src/java.desktop/share/native/libsplashscreen/libpng/UPDATING.txt were skipped because this file was not introduced by the 8u backport of 8208353. That's okay, as for 8u we will backport libpng from 11u or newer JDK releases, and not directly from the library.

Thanks!

---

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

• JDK-8295685: Update Libpng to 1.6.38 (Bug - P2)

Reviewers

• Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/372/head:pull/372
$ git checkout pull/372

Update a local copy of the PR:
$ git checkout pull/372
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/372/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 372

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/372.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

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

[openjdk]

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

[mlbridge]

Webrevs

• 03: Full - Incremental (a08562f1)
• 02: Full - Incremental (76485d11)
• 01: Full - Incremental (3fa3cfaf)
• 00: Full (85094a60)

[kvergizova]

The changes look good to me, although I'm not a reviewer.
But maybe it's better not to transfer .md syntax like ### and ``` into plain THIRD_PARTY_README files?

[martinuy]

Hi @kvergizova ,

Thanks for having a look. You're right. The markdown syntax does not belong to the original libpng file, and there is no gain in keeping it because 11u-dev changes will not apply cleanly anyways (it's different files). I'll fix it and rebase PR 373.

Martin.-

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8295685
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

⚠️ @martinuy This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

[gnu-andrew]

Backport looks good to me. Good catch on the markdown. Please request approval with the jdk8u-fix-request label and an appropriate comment on the bug.

I thought we'd removed the duplicate README files but it appears not. Maybe worth proposing after these PRs are in.

[openjdk]

@martinuy Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk]

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

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

8295685: Update Libpng to 1.6.38

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.

[gnu-andrew]

Rebasing was the right thing for a dependent PR. The bot whines regardless, and the list of commits was a mess with the merge.

[martinuy]

Sorry for the noise, I intended to rebase and somehow a merge sneaked into. The history is clean now.

[gnu-andrew]

Approved for 8u-dev.

[martinuy]

/integrate

[openjdk]

Going to push as commit 5b76d03.

[openjdk]

@martinuy Pushed as commit 5b76d03.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.