Merge pull request #237 from pshipton/revhb7

Revert Update Harfbuzz to 7.0.1

Author: keithc-ca

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -446,7 +446,7 @@ else
                         -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
    endif
    ifeq ($(call isTargetOs, linux macosx), true)
-     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
+     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
    endif
 
    # Early re-canonizing has to be disabled to workaround an internal XlC compiler error
@@ -459,9 +459,8 @@ else
    LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc
 
    HARFBUZZ_DISABLED_WARNINGS_gcc := type-limits missing-field-initializers strict-aliasing
-   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
    HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
-        maybe-uninitialized class-memaccess unused-result extra use-after-free noexcept-type
+        maybe-uninitialized class-memaccess unused-result extra use-after-free
    HARFBUZZ_DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
         tautological-constant-out-of-range-compare int-to-pointer-cast \
         undef missing-field-initializers range-loop-analysis \

src/java.desktop/share/legal/harfbuzz.md

@@ -1,8 +1,8 @@
-## Harfbuzz v7.0.1
+## Harfbuzz v4.4.1
 
 ### Harfbuzz License
 
-https://github.com/harfbuzz/harfbuzz/blob/7.0.1/COPYING
+https://github.com/harfbuzz/harfbuzz/blob/4.4.1/COPYING
 
 <pre>
 
@@ -12,22 +12,21 @@ files names COPYING in subdirectories where applicable.
 
 Copyright © 2010-2022  Google, Inc.
 Copyright © 2018-2020  Ebrahim Byagowi
-Copyright © 2004-2013  Red Hat, Inc.
-Copyright © 2019  Facebook, Inc.
+Copyright © 2019-2020  Facebook, Inc.
+Copyright © 2012-2015  Mozilla Foundation.
+Copyright © 2011  Codethink Limited
+Copyright © 2008-2010  Nokia Corporation and/or its subsidiary(-ies)
+Copyright © 2009  Keith Stribley
+Copyright © 2009  Martin Hosken and SIL International
 Copyright © 2007  Chris Wilson
-Copyright © 2018-2019 Adobe Inc.
-Copyright © 2006-2023 Behdad Esfahbod
+Copyright © 2005-2022 Behdad Esfahbod
+Copyright © 2005  David Turner
+Copyright © 2004-2013  Red Hat, Inc.
 Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2009  Keith Stribley
-Copyright © 2018  Khaled Hosny
 Copyright © 2016  Elie Roux <[email protected]>
+Copyright © 2018-2019 Adobe Inc.
+Copyright © 2018  Khaled Hosny
 Copyright © 2016  Igalia S.L.
-Copyright © 2015  Mozilla Foundation.
-Copyright © 1999  David Turner
-Copyright © 2005  Werner Lemberg
-Copyright © 2013-2015  Alexei Podtelezhnikov
-Copyright © 2022 Matthias Clasen
-Copyright © 2011  Codethink Limited
 
 For full copyright notices consult the individual files in the package.
 
@@ -73,23 +72,3 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 </pre>
-
-### AUTHORS File Information
-```
-
-Behdad Esfahbod
-David Corbett
-David Turner
-Ebrahim Byagowi
-Garret Rieger
-Jonathan Kew
-Khaled Hosny
-Lars Knoll
-Martin Hosken
-Owen Taylor
-Roderick Sheeter
-Roozbeh Pournader
-Simon Hausmann
-Werner Lemberg
-
-```