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

8297088: Update LCMS to 2.14 #1659

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 16, 2023

I backport this for parity with 11.0.19-oracle.

I had to resolve cmsio0.c because "8273135: java/awt/color/ICC_ColorSpace/MTTransformReplacedProfile.java crashes"
is not in 11. I checked whether backporting that
change make sense. But that change again depends on
"8271718: Crash when during color transformation the color profile is replaced"
which is hard to backport because "8263482: Make access to the ICC color profiles data multithread-friendly"
is not in 11. This again is not good for backporting.

So I rather did the simple resolve. This required change should not wait for eventual complicated other backports.

Anyways, it might end up being marked as clean.


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/jdk11u-dev pull/1659/head:pull/1659
$ git checkout pull/1659

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1659

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2023

👋 Welcome back goetz! 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 f2c3f352bbe7222d7a43fa26f091372ecef20a68 8297088: Update LCMS to 2.14 Jan 16, 2023
@openjdk
Copy link

openjdk bot commented Jan 16, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jan 16, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 16, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 17, 2023

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

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

8297088: Update LCMS to 2.14

Reviewed-by: mbaesken

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

  • b52d8ad: 8283717: vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001 failed due to SocketTimeoutException
  • 9c684a1: 8294947: Use 64bit atomics in patch_verified_entry on x86_64
  • 71e89e1: 8297569: URLPermission constructor throws IllegalArgumentException: Invalid characters in hostname after JDK-8294378
  • 8458368: 8294378: URLPermission constructor exception when using tr locale
  • 6faa77c: 8285835: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work
  • c20794c: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • 466edc0: 8214445: [test] java/net/URL/HandlerLoop has illegal reflective access

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 17, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jan 18, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 18, 2023

Going to push as commit 01b2138.
Since your change was applied there have been 32 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 18, 2023

@GoeLin Pushed as commit 01b2138.

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

@GoeLin GoeLin deleted the goetz_backport_8297088 branch January 18, 2023 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants