[Emacs-diffs] master 2ce56c5: Workaround a libotf crash with Kannada font (bug#30193)

[Glenn Morris]

branch: master
commit 2ce56c51a83f6658cc6c79e4cc3716cfddbb03ff
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Workaround a libotf crash with Kannada font (bug#30193)
    
    * configure.ac (HAVE_OTF_KANNADA_BUG): New define.
    * src/xfaces.c (syms_of_xfaces) <Vface_ignored_fonts>:
    Add problematic Kannada font if necessary.
---
 configure.ac | 5 +++++
 src/xfaces.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index 1c4255d..eb7e5ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3303,6 +3303,11 @@ if test "${HAVE_X11}" = "yes"; then
            AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
                      [Define to 1 if libotf has OTF_get_variation_glyphs.])
          fi
+         EMACS_CHECK_MODULES([OTFOK], [libotf >= 0.9.16])
+         if test "$HAVE_OTFOK" != "yes"; then
+           AC_DEFINE(HAVE_OTF_KANNADA_BUG, 1,
+[Define to 1 if libotf is affected by https://debbugs.gnu.org/28110.])
+         fi
        fi
       fi
     dnl FIXME should there be an error if HAVE_FREETYPE != yes?
diff --git a/src/xfaces.c b/src/xfaces.c
index 3479799..77afee4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6526,7 +6526,12 @@ other font of the appropriate family and registry is 
available.  */);
               doc: /* List of ignored fonts.
 Each element is a regular expression that matches names of fonts to
 ignore.  */);
+#ifdef HAVE_OTF_KANNADA_BUG
+  /* https://debbugs.gnu.org/30193  */
+  Vface_ignored_fonts = list1 (build_string ("Noto Serif Kannada"));
+#else
   Vface_ignored_fonts = Qnil;
+#endif
 
   DEFVAR_LISP ("face-remapping-alist", Vface_remapping_alist,
               doc: /* Alist of face remappings.