[jdk11u-dev] RFR: 8313643: Update HarfBuzz to 8.2.2
Goetz Lindenmaier
goetz at openjdk.org
Fri Dec 15 14:43:45 UTC 2023
On Fri, 15 Dec 2023 08:32:10 GMT, Amos Shi <ashi at openjdk.org> wrote:
> 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+.
Hi @amosshi, if you base this on the 17u backport it will be clean. Just adapt the title of the PR...
-------------
PR Comment: https://git.openjdk.org/jdk11u-dev/pull/2398#issuecomment-1857989524
More information about the jdk-updates-dev
mailing list