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

JDK-8301998: Update HarfBuzz to 7.0.1 #12913

Closed
wants to merge 5 commits into from

Conversation

honkar-jdk
Copy link
Contributor

@honkar-jdk honkar-jdk commented Mar 7, 2023

HarfBuzz library updated from v4.4.1 to v7.0.1

  • harfbuzz.md file updated
  • Added -DHB_NO_VISIBILITY to HARFBUZZ_CFLAGS in Awt2DLibraries.gmk to avoid build issues on linux and macos targets.
  • GPOS.hh moved to Layout to Layout/GPOS to match upstream changes.
  • hb-ot-color-* files moved to OT/Color to match upstream changes.
  • 41 newly added, 8 deleted and 224 modified files (src + harfbuzz.md).

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12913

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2023

👋 Welcome back honkar! 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 Mar 7, 2023
@openjdk
Copy link

openjdk bot commented Mar 7, 2023

@honkar-jdk The following labels will be automatically applied to this pull request:

  • build
  • client

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

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Mar 7, 2023
@honkar-jdk honkar-jdk changed the title JDK-8301998 Update HarfBuzz to 7.0.1 JDK-8301998: Update HarfBuzz to 7.0.1 Mar 7, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2023

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Bulid changes look good.

@openjdk
Copy link

openjdk bot commented Mar 9, 2023

@honkar-jdk 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:

8301998: Update HarfBuzz to 7.0.1

Reviewed-by: erikj, 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 122 new commits pushed to the master branch:

  • 45809fd: 8295884: Implement IDE support for Eclipse
  • baf11e7: 8303814: getLastErrorString should avoid charset conversions
  • 830fd41: 8302795: Shared archive failed on old version class with jsr bytecode
  • 4e631fa: 8298966: Deprecate JMX Subject Delegation and the method JMXConnector.getMBeanServerConnection(Subject) for removal.
  • 10f1674: 8303809: Dispose context in SPNEGO NegotiatorImpl
  • 9f9ab02: 8303895: Simplify and clean up LinkFactory code
  • a00f5d2: 8303861: Error handling step timeouts should never be blocked by OnError and others
  • da044dd: 8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors
  • c466cdf: 8299546: C2: MulLNode::mul_ring() wrongly returns bottom type due to casting errors with large numbers
  • 55aa122: 8304059: Use InstanceKlass in dependencies
  • ... and 112 more: https://git.openjdk.org/jdk/compare/ccfe1675a2a82accbca0ecd8bd6f1c167a1c06c6...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.

➡️ 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 Mar 9, 2023
@jcking
Copy link
Contributor

jcking commented Mar 10, 2023

FYI HarfBuzz most recent is 7.1.0 as of last week. Might make sense to just bite the bullet as it were and to 7.1.0 instead of 7.0.1.

@prrace
Copy link
Contributor

prrace commented Mar 10, 2023

FYI HarfBuzz most recent is 7.1.0 as of last week. Might make sense to just bite the bullet as it were and to 7.1.0 instead of 7.0.1.

We already switched once from 7.0 to 7.0.1. By the time we've got 7.1 in review, there might be a 7.2 ..
I think it best to finish this big upgrade which is 99% done rather than starting over with an even bigger upgrade. Going from 7.0.1 to (eg) 7.1 or a hypothetical 7.2 will then be easier.

@honkar-jdk
Copy link
Contributor Author

honkar-jdk commented Mar 11, 2023

Builds and Automated tests are successful with the new Harfbuzz changes (v7.0.1).
Manual testing was carried out on Mac, Windows & Linux (Ubuntu) and works as expected.

@@ -103,20 +103,20 @@
#pragma GCC diagnostic warning "-Wdisabled-optimization"
#pragma GCC diagnostic warning "-Wdouble-promotion"
#pragma GCC diagnostic warning "-Wformat=2"
#pragma GCC diagnostic warning "-Wformat-signedness"
#pragma GCC diagnostic warning "-Wignored-pragma-optimize"
Copy link
Contributor

Choose a reason for hiding this comment

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

Reading these changes makes me think we should re-check if all the DISABLED_WARNINGS we have for
harbuzz in Awt2DLibraries.gmk (see lines 466-470 in that file) are still needed.
In particular for gcc + clang (ie windows and mac builds).
Can you comment them out (in that file) and test the build ? Any that are now un-needed can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@prrace Checked by commenting out the HARFBUZZ_DISABLED_WARNINGS section in Awt2DLibraries.gmk, all the currently listed warnings (for specific platform compilers) are required else the build fails.

Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

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

Ok - we are good to go.

@honkar-jdk
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2023

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

  • 617c15f: 8304172: ProblemList serviceability/sa/UniqueVtableTest.java
  • f81e1de: 8303882: Refactor some iterators in jdk.compiler
  • 45809fd: 8295884: Implement IDE support for Eclipse
  • baf11e7: 8303814: getLastErrorString should avoid charset conversions
  • 830fd41: 8302795: Shared archive failed on old version class with jsr bytecode
  • 4e631fa: 8298966: Deprecate JMX Subject Delegation and the method JMXConnector.getMBeanServerConnection(Subject) for removal.
  • 10f1674: 8303809: Dispose context in SPNEGO NegotiatorImpl
  • 9f9ab02: 8303895: Simplify and clean up LinkFactory code
  • a00f5d2: 8303861: Error handling step timeouts should never be blocked by OnError and others
  • da044dd: 8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors
  • ... and 114 more: https://git.openjdk.org/jdk/compare/ccfe1675a2a82accbca0ecd8bd6f1c167a1c06c6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2023

@honkar-jdk Pushed as commit f5c8b68.

💡 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
build build-dev@openjdk.org client client-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants