summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-09-23 13:48:11 +0200
committerAndras Timar <andras.timar@collabora.com>2021-03-12 14:53:43 +0100
commit6a25c5a13b510d78ed96b6d14a251a9de335a2e1 (patch)
tree0637ac9ab904429a2877373174f384c5975233d6
parentrename a cairo patch to make room for the next patch (diff)
downloadcore-6a25c5a13b510d78ed96b6d14a251a9de335a2e1.tar.gz
core-6a25c5a13b510d78ed96b6d14a251a9de335a2e1.zip
cairo: avoid linking to freetype-2.8 symbols
This is meant to help producing binaries which run on Ubuntu 16.04. Change-Id: Ie4cd3fe707225a951ec8a5fb49a755064701dcfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103248 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--external/cairo/UnpackedTarball_cairo.mk1
-rw-r--r--external/cairo/cairo/cairo.oldfreetype.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index 186971410840..b31c61bac5f5 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
external/cairo/cairo/cairo-1.10.2.patch \
external/cairo/cairo/cairo.oldfreetypecentos6.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.