diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-24 10:39:01 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-24 10:56:57 +0200 |
| commit | 83a5e33afaedb15a919fe6cc9f1866f3745dd114 (patch) | |
| tree | da7dc83452f2d805c5116cbfec096865f9adeb86 /external | |
| parent | 7e610406a2d063ba5efacb0e186524c2a4ed77a9 (diff) | |
cairo: avoid linking to freetype-2.8-only FT_Get_Var_Design_Coordinates
This is meant to help producing binaries which run on Ubuntu 16.04.
Change-Id: I7fc965c265d2ac97a6836df0829d3d4cd0cc9333
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103295
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/cairo/cairo.oldfreetype.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/external/cairo/cairo/cairo.oldfreetype.patch b/external/cairo/cairo/cairo.oldfreetype.patch index 2ccc1908fa22..a25c8bbdd030 100644 --- a/external/cairo/cairo/cairo.oldfreetype.patch +++ b/external/cairo/cairo/cairo.oldfreetype.patch @@ -9,3 +9,34 @@ /* If FT_Get_Var_Blend_Coordinates() is available, we can check if the * current design coordinates are the default coordinates. In this case * the current outlines match the font tables. +--- a/cairo/src/cairo-ft-font.c 2020-09-24 10:35:25.391941702 +0200 ++++ b/cairo/src/cairo-ft-font.c 2020-09-24 10:35:39.900126419 +0200 +@@ -451,7 +451,7 @@ + unscaled->have_color = FT_HAS_COLOR (face) != 0; + unscaled->have_color_set = TRUE; + +-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES ++#if 0 + { + FT_MM_Var *ft_mm_var; + if (0 == FT_Get_MM_Var (face, &ft_mm_var)) +@@ -2377,7 +2377,7 @@ + } + + current_coords = malloc (sizeof (FT_Fixed) * ft_mm_var->num_axis); +-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES ++#if 0 + ret = FT_Get_Var_Design_Coordinates (face, ft_mm_var->num_axis, current_coords); + if (ret == 0) { + for (i = 0; i < ft_mm_var->num_axis; i++) { +--- a/cairo/test/font-variations.c 2020-09-24 10:36:01.592402635 +0200 ++++ b/cairo/test/font-variations.c 2020-09-24 10:36:08.728493510 +0200 +@@ -117,7 +117,7 @@ + return CAIRO_TEST_FAILURE; + } + +-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES ++#if 0 + ret = FT_Get_Var_Design_Coordinates (ft_face, 20, coords); + if (ret != 0) { + cairo_test_log (ctx, "Failed to get coords"); |