[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - configure.ac vcl/source

[Khaled Hosny]

 configure.ac                       |    2 +-
 vcl/source/gdi/CommonSalLayout.cxx |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d63b9a335a83250b4e0dc4514f484f131f35fda2
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Dec 2 08:06:08 2016 +0200

    Require HarfBuzz 0.9.42
    
    This is the first version where hb_buffer_set_cluster_level() was
    introduced. The layout engine depends on this feature in a few places
    and though we can build without it, the result will be wrong in some
    cases (i.e. any where we assume combining marks will have their own
    cluster number).
    
    Reviewed-on: https://gerrit.libreoffice.org/31521
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    Tested-by: Khaled Hosny <khaledhosny at eglug.org>
    (cherry picked from commit b9fe5dc791f56df55495d171ae901a246907c68b)
    
    Change-Id: I89187f317052e7933b83ad0350cace239333510b
    Reviewed-on: https://gerrit.libreoffice.org/31572
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/configure.ac b/configure.ac
index 2dadc7c..9f5b029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9281,7 +9281,7 @@ AC_SUBST(ENABLE_ORCUS)
 dnl ===================================================================
 dnl HarfBuzz
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
 if test "$COM" = "MSC"; then # override the above
     HARFBUZZ_LIBS="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.lib"
 fi
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 4c5327e..dbc3fa8 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -551,9 +551,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
             hb_buffer_add_utf16(
                 pHbBuffer, reinterpret_cast<uint16_t const *>(pStr), nLength,
                 nMinRunPos, nRunLen);
-#if HB_VERSION_ATLEAST(0, 9, 42)
             hb_buffer_set_cluster_level(pHbBuffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-#endif
+
             // The shapers that we want HarfBuzz to use, in the order of
             // preference. The coretext_aat shaper is available only on macOS,
             // but there is no harm in always including it, HarfBuzz will
@@ -598,10 +597,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
                 sal_Int32 indexUtf16 = nCharPos;
                 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&indexUtf16, 0);
 
-#if HB_VERSION_ATLEAST(0, 9, 42)
                 if (u_getIntPropertyValue(aChar, UCHAR_GENERAL_CATEGORY) == U_NON_SPACING_MARK)
                     nGlyphFlags |= GlyphItem::IS_DIACRITIC;
-#endif
 
                 if ((aSubRun.maScript == HB_SCRIPT_ARABIC ||
                      aSubRun.maScript == HB_SCRIPT_SYRIAC) &&