diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-23 13:48:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-25 13:13:46 +0200 |
| commit | 7b0746a2760b62c504236d8ff44d6e150c59abe9 (patch) | |
| tree | 0f01c2ecec13d4a9bc949b3a306e014b86fe5f62 /external | |
| parent | 787bc48c883b70b1721805b5d6a93bd731983410 (diff) | |
tdf#136980 cairo: avoid linking to freetype-2.8 symbols
This is meant to help producing binaries on CentOS 7 which run on Ubuntu
16.04, when using internal cairo.
Change-Id: Ie4cd3fe707225a951ec8a5fb49a755064701dcfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103378
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 1 | ||||
| -rw-r--r-- | external/cairo/cairo/cairo.oldfreetype.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 8e45e9c28c1d..75e3d58e7dee 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo)) $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ external/cairo/cairo/cairo-1.10.2.patch \ external/cairo/cairo/cairo-libtool-rpath.patch.1 \ + external/cairo/cairo/cairo.oldfreetype.patch \ )) ifeq ($(OS),iOS) diff --git a/external/cairo/cairo/cairo.oldfreetype.patch b/external/cairo/cairo/cairo.oldfreetype.patch new file mode 100644 index 000000000000..2ccc1908fa22 --- /dev/null +++ b/external/cairo/cairo/cairo.oldfreetype.patch @@ -0,0 +1,11 @@ +--- a/cairo/src/cairo-ft-font.c 2020-09-23 15:27:09.114619562 +0200 ++++ b/cairo/src/cairo-ft-font.c 2020-09-23 15:27:22.602808705 +0200 +@@ -2838,7 +2838,7 @@ + goto cleanup; + } + +-#if FREETYPE_MAJOR > 2 || ( FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 8) ++#if 0 + /* 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. |