1--- a/cairo/src/cairo-ft-font.c 2020-09-23 15:27:09.114619562 +0200 2+++ b/cairo/src/cairo-ft-font.c 2020-09-23 15:27:22.602808705 +0200 3@@ -2838,7 +2838,7 @@ 4 goto cleanup; 5 } 6 7-#if FREETYPE_MAJOR > 2 || ( FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 8) 8+#if 0 9 /* If FT_Get_Var_Blend_Coordinates() is available, we can check if the 10 * current design coordinates are the default coordinates. In this case 11 * the current outlines match the font tables. 12--- a/cairo/src/cairo-ft-font.c 2020-09-24 10:35:25.391941702 +0200 13+++ b/cairo/src/cairo-ft-font.c 2020-09-24 10:35:39.900126419 +0200 14@@ -451,7 +451,7 @@ 15 unscaled->have_color = FT_HAS_COLOR (face) != 0; 16 unscaled->have_color_set = TRUE; 17 18-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES 19+#if 0 20 { 21 FT_MM_Var *ft_mm_var; 22 if (0 == FT_Get_MM_Var (face, &ft_mm_var)) 23@@ -2377,7 +2377,7 @@ 24 } 25 26 current_coords = malloc (sizeof (FT_Fixed) * ft_mm_var->num_axis); 27-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES 28+#if 0 29 ret = FT_Get_Var_Design_Coordinates (face, ft_mm_var->num_axis, current_coords); 30 if (ret == 0) { 31 for (i = 0; i < ft_mm_var->num_axis; i++) { 32--- a/cairo/test/font-variations.c 2020-09-24 10:36:01.592402635 +0200 33+++ b/cairo/test/font-variations.c 2020-09-24 10:36:08.728493510 +0200 34@@ -117,7 +117,7 @@ 35 return CAIRO_TEST_FAILURE; 36 } 37 38-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES 39+#if 0 40 ret = FT_Get_Var_Design_Coordinates (ft_face, 20, coords); 41 if (ret != 0) { 42 cairo_test_log (ctx, "Failed to get coords"); 43