Navigation Menu

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

8293672: Update freetype md file #10561

Closed
wants to merge 2 commits into from

Conversation

DamonGuy
Copy link
Contributor

@DamonGuy DamonGuy commented Oct 4, 2022

Update the freetype md file with the newly generated md file. The new format slightly differs from the previous version when separating different licenses. Added logic for combining of copyright lines and support for other licenses such as MIT.


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 pull/10561/head:pull/10561
$ git checkout pull/10561

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10561

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 4, 2022

👋 Welcome back dnguyen! 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 added the rfr Pull request is ready for review label Oct 4, 2022
@openjdk
Copy link

openjdk bot commented Oct 4, 2022

@DamonGuy The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Oct 4, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 4, 2022

Webrevs

@DamonGuy DamonGuy marked this pull request as draft October 4, 2022 17:46
@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 4, 2022
@DamonGuy DamonGuy marked this pull request as ready for review October 4, 2022 17:51
@@ -1,4 +1,4 @@
## The FreeType Project: Freetype v2.12.0
## The FreeType Project: Freetype v2.12.1

Copy link
Contributor

Choose a reason for hiding this comment

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

Why does this show a .0 -> .1 update ?
The currently checked in file was updated in July so it already has .1 .. so that is very puzzling to me.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm .. it has disappeared with your 2nd commit. I can only suppose you were using a VERY out of date repo ..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Needed to resync branch. Resolved!


/*
* Copyright 2000 Computing Research Labs, New Mexico State University
* Copyright 2001-2015
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did this notice need to be moved down to the end of the file ?
It makes the diff look bigger than it actually is and I can't imagine any reason we would need to change the order.

Copy link
Contributor Author

@DamonGuy DamonGuy Oct 4, 2022

Choose a reason for hiding this comment

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

This is due to the addition of the MIT license being treated as a separate license from the freetype license. In the modified tool, licenses are separated by license type. The additional freetype licenses are "variants" of the primary license (freetype) so it seemed to make sense for it to follow the freetype & GPL license. Then, other licenses (such as MIT in this case) follow afterwards.

This can be manually modified to maintain the old order but I believed it made more sense this way in the tool since variants of the primary license would follow the primary license.

Copy link
Contributor

Choose a reason for hiding this comment

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

Well if it is only a one-off...

BTW phrases such as "the modified tool" etc are very out of place here .. I don't see a tool in this PR, do you ?
I believe you are referring to some script(s) that not part of OpenJDK that you are using to produce these updates.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 4, 2022
@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

8293672: Update freetype md file

Reviewed-by: prr

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

  • 5c030cc: 8290973: In AffineTransform, equals(Object) is inconsistent with hashCode()
  • f888aa9: 8293061: Combine CDSOptions and AppCDSOptions test utility classes
  • 73f0646: 8294839: Disable StressLongCountedLoop in compiler/loopopts/TestRemoveEmptyLoop.java
  • 2ceebf6: 8294456: Fix misleading-indentation warnings in core JDK libraries
  • ad7b7d4: 8294697: java/lang/Thread/virtual/ThreadAPI.testGetStackTrace2 failed with non-empty stack trace
  • e38ae8a: 8294759: Print actual lock/monitor ranking
  • 7012d4b: 8294837: unify Windows 2019 version check in os_windows and java_props_md
  • 8c15f77: 8270915: GIFImageReader disregards ignoreMetadata flag which causes memory exhaustion
  • 6029120: 8278086: [REDO] ImageIO.write() method will throw IndexOutOfBoundsException
  • 8f56115: 8294679: RISC-V: Misc crash dump improvements
  • ... and 22 more: https://git.openjdk.org/jdk/compare/121d4a5119f98adf30fa759563eec843a6e37d61...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@prrace) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 4, 2022
@DamonGuy DamonGuy marked this pull request as draft October 4, 2022 18:49
@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 4, 2022
@DamonGuy DamonGuy marked this pull request as ready for review October 4, 2022 19:45
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 4, 2022
@DamonGuy
Copy link
Contributor Author

DamonGuy commented Oct 6, 2022

/integrate

@prrace
Copy link
Contributor

prrace commented Oct 6, 2022

/sponsor

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 6, 2022
@openjdk
Copy link

openjdk bot commented Oct 6, 2022

@DamonGuy
Your change (at version 16c4ed0) is now ready to be sponsored by a Committer.

@prrace
Copy link
Contributor

prrace commented Oct 6, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 6, 2022

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

  • 5c030cc: 8290973: In AffineTransform, equals(Object) is inconsistent with hashCode()
  • f888aa9: 8293061: Combine CDSOptions and AppCDSOptions test utility classes
  • 73f0646: 8294839: Disable StressLongCountedLoop in compiler/loopopts/TestRemoveEmptyLoop.java
  • 2ceebf6: 8294456: Fix misleading-indentation warnings in core JDK libraries
  • ad7b7d4: 8294697: java/lang/Thread/virtual/ThreadAPI.testGetStackTrace2 failed with non-empty stack trace
  • e38ae8a: 8294759: Print actual lock/monitor ranking
  • 7012d4b: 8294837: unify Windows 2019 version check in os_windows and java_props_md
  • 8c15f77: 8270915: GIFImageReader disregards ignoreMetadata flag which causes memory exhaustion
  • 6029120: 8278086: [REDO] ImageIO.write() method will throw IndexOutOfBoundsException
  • 8f56115: 8294679: RISC-V: Misc crash dump improvements
  • ... and 22 more: https://git.openjdk.org/jdk/compare/121d4a5119f98adf30fa759563eec843a6e37d61...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 6, 2022
@openjdk openjdk bot closed this Oct 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 6, 2022
@openjdk
Copy link

openjdk bot commented Oct 6, 2022

@prrace @DamonGuy Pushed as commit fef345b.

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

@openjdk
Copy link

openjdk bot commented Oct 6, 2022

@prrace The command sponsor can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants