From c54a7022feeb42aa89c0e9aeb80fd3c959d02c97 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 21 Jan 2023 14:07:41 -0700
Subject: [PATCH] [hb-view] Require cairo 1.17.5 for HB_DRAW=1 default again

Fixes https://github.com/harfbuzz/harfbuzz/issues/4051
---
 util/helper-cairo.hh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh
index c62413150..91fb87379 100644
--- a/util/helper-cairo.hh
+++ b/util/helper-cairo.hh
@@ -73,16 +73,12 @@ helper_cairo_use_hb_draw (const font_options_t *font_opts)
 {
   const char *env = getenv ("HB_DRAW");
   if (!env)
-#if 1
-    /* Following branch disabled because we prefer our
-     * OpenType extensions working, ie going through hb-draw,
-     * over avoiding the obscure cairo bug. */
-    return true;
-#else
     /* Older cairo had a bug in rendering COLRv0 fonts in
-     * right-to-left direction. */
+     * right-to-left direction as well as clipping issue
+     * with user-fonts.
+     *
+     * https://github.com/harfbuzz/harfbuzz/issues/4051 */
     return cairo_version () >= CAIRO_VERSION_ENCODE (1, 17, 5);
-#endif
 
   return atoi (env);
 }