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.

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

8260380: Upgrade to LittleCMS 2.12 #40

Closed
wants to merge 1 commit into from

Conversation

@dimitryc
Copy link
Collaborator

@dimitryc dimitryc commented Apr 28, 2021

Request to backport for parity with 11u. Applies cleanly.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk15u-dev pull/40/head:pull/40
$ git checkout pull/40

Update a local copy of the PR:
$ git checkout pull/40
$ git pull https://git.openjdk.java.net/jdk15u-dev pull/40/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 40

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk15u-dev/pull/40.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 28, 2021

👋 Welcome back dcherepanov! 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 openjdk bot changed the title Backport 4caeb39f01b13b5472d8dacb268262fd418fd0c4 8260380: Upgrade to LittleCMS 2.12 Apr 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 28, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Apr 28, 2021

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

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

8260380: Upgrade to LittleCMS 2.12

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 6 new commits pushed to the master branch:

  • d79cd94: 8261170: Upgrade to FreeType 2.10.4
  • 9b0ba2a: 8256633: Fix product build on Windows+Arm64
  • 981267e: 8257633: Missing -mmacosx-version-min=X flag when linking libjvm
  • a92bbe8: 8257547: Handle multiple prereqs on the same line in deps files
  • 1295143: 8256810: Incremental rebuild broken on Macosx
  • 70230e2: 8256751: Incremental rebuild with precompiled header fails when touching a header file

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 28, 2021

Webrevs

@dimitryc
Copy link
Collaborator Author

@dimitryc dimitryc commented May 4, 2021

/integrate

@openjdk openjdk bot closed this May 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 4, 2021

@dimitryc Since your change was applied there have been 8 commits pushed to the master branch:

  • acf2eea: 8264786: [macos] All Swing/AWT apps cause Allow Notifications prompt to appear when app is launched
  • 9caa290: 8255845: Memory leak in imageFile.cpp
  • d79cd94: 8261170: Upgrade to FreeType 2.10.4
  • 9b0ba2a: 8256633: Fix product build on Windows+Arm64
  • 981267e: 8257633: Missing -mmacosx-version-min=X flag when linking libjvm
  • a92bbe8: 8257547: Handle multiple prereqs on the same line in deps files
  • 1295143: 8256810: Incremental rebuild broken on Macosx
  • 70230e2: 8256751: Incremental rebuild with precompiled header fails when touching a header file

Your commit was automatically rebased without conflicts.

Pushed as commit 547c798.

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

@dimitryc dimitryc deleted the dimitryc:backport-8260380 branch May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant