external/cairo/ExternalProject_cairo.mk | 1 external/cairo/UnpackedTarball_cairo.mk | 3 external/cairo/cairo/cairo.oldfreetype.patch | 112 ++++++-------------- external/cairo/cairo/cairo.oldfreetypecentos6.patch | 78 +++++++++++++ 4 files changed, 119 insertions(+), 75 deletions(-)
New commits: commit 3fb1632217a1d7aa05d28482c1291123daee0da1 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Thu Sep 24 10:39:01 2020 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Mar 12 14:54:08 2021 +0100 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 <jenkinscollaboraoff...@gmail.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> 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"); commit 6a25c5a13b510d78ed96b6d14a251a9de335a2e1 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Wed Sep 23 13:48:11 2020 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Mar 12 14:53:43 2021 +0100 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 <jenkinscollaboraoff...@gmail.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> 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. commit eda42b714c0e5db7bbb8565e0a25ad5e31e5b546 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Mar 12 14:53:23 2021 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Mar 12 14:53:23 2021 +0100 rename a cairo patch to make room for the next patch Change-Id: If1964ebfec41074e8d1ef83428e6e51a4b68df52 diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 7d3537bbc4fb..186971410840 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -13,7 +13,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.oldfreetype.patch \ + external/cairo/cairo/cairo.oldfreetypecentos6.patch \ external/cairo/cairo/cairo-libtool-rpath.patch.1 \ )) diff --git a/external/cairo/cairo/cairo.oldfreetype.patch b/external/cairo/cairo/cairo.oldfreetypecentos6.patch similarity index 100% rename from external/cairo/cairo/cairo.oldfreetype.patch rename to external/cairo/cairo/cairo.oldfreetypecentos6.patch commit 314d586f023b466eaf280abb19cff5e0e066c127 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Mar 25 11:45:37 2019 +0000 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Mar 12 14:45:28 2021 +0100 cairo configure fails with gold linker with sanitizers enabled Change-Id: I1afbe64fdd8847b0a826be58ee81f218308a0ef5 Reviewed-on: https://gerrit.libreoffice.org/69661 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 39a05303344b..3dac98fc4362 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -47,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(filter-out ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \ $(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ LIBS="$(ZLIB_LIBS)" \ + $(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ $(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits