[jdk11u-dev] RFR: 8313643: Update HarfBuzz to 8.2.2

Amos Shi ashi at openjdk.org
Fri Dec 15 08:37:15 UTC 2023


Backport of [JDK-8313643](https://bugs.openjdk.org/browse/JDK-8313643)

Unclean Backport:
- `src/java.desktop/share/native/libharfbuzz/hb-subset.cc`
  - Manually merged the code of bellow; 
  - This file change could be considered as `Clean`


@@ -43,21 +43,19 @@
 #include "OT/Color/sbix/sbix.hh"
 #include "hb-ot-os2-table.hh"
 #include "hb-ot-post-table.hh"
-
-#if !defined(AIX) || defined(AIX_XLC_GE_17)
 #include "hb-ot-post-table-v2subset.hh"
-#endif
-
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-vorg-table.hh"
 #include "hb-ot-name-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
+#include "hb-ot-var-avar-table.hh"
 #include "hb-ot-var-cvar-table.hh"
 #include "hb-ot-var-fvar-table.hh"
 #include "hb-ot-var-gvar-table.hh"
 #include "hb-ot-var-hvar-table.hh"
+#include "hb-ot-var-mvar-table.hh"
 #include "hb-ot-math-table.hh"
 #include "hb-ot-stat-table.hh"
 #include "hb-repacker.hh"


- `make/modules/java.desktop/lib/Awt2dLibraries.gmk`
  - Manually merged the code of bellow to the file `make/lib/Awt2dLibraries.gmk`.
  - This file change could be considered as `Clean`


@@ -495,6 +495,11 @@
    # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
    LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc
 
+   # list of disabled warnings and the compilers for which it was specifically added.
+   # array-bounds         -> GCC 12 on Alpine Linux
+   # parentheses          -> GCC 6
+   # range-loop-analysis  -> clang on Xcode12
+
    HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers strict-aliasing \
        unused-result array-bounds parentheses
    # noexcept-type required for GCC 7 builds. Not required for GCC 8+.

-------------

Commit messages:
 - Backport 2182c93689f35c809f4d79a8002c838f8c4f56f3

Changes: https://git.openjdk.org/jdk11u-dev/pull/2398/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2398&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8313643
  Stats: 12812 lines in 179 files changed: 7127 ins; 1316 del; 4369 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/2398.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/2398/head:pull/2398

PR: https://git.openjdk.org/jdk11u-dev/pull/2398


More information about the jdk-updates-dev mailing list