From 542f8269cbb5028cead28f7add6500611b57e772 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 4 Feb 2022 18:45:04 -0600
Subject: [PATCH] [util/draw/ft] Use hb-draw for font-funcs=ft as well

If cairo is >= 1.17.5.

This essentially breaks emoji and bitmap fonts for now.
---
 util/helper-cairo.hh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh
index b42913e37..40ea5d386 100644
--- a/util/helper-cairo.hh
+++ b/util/helper-cairo.hh
@@ -69,8 +69,7 @@ _cairo_eps_surface_create_for_stream (cairo_write_func_t  write_func,
 static inline bool
 helper_cairo_use_hb_draw (const font_options_t *font_opts)
 {
-  return cairo_version () >= CAIRO_VERSION_ENCODE (1, 17, 5) &&
-	 (font_opts->font_funcs && strcmp (font_opts->font_funcs, "ft"));
+  return cairo_version () >= CAIRO_VERSION_ENCODE (1, 17, 5);
 }
 
 static inline cairo_scaled_font_t *