summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-05-05 15:20:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-05-05 18:03:52 +0200
commitcf7e3ac040d1249f6df0d6796e11d834285680f0 (patch)
tree054cc1a20e5acb0ce37d3e6793031184de7826dc /external
parent9e57e164844e67faaf2b0424181c2df29e871992 (diff)
Reinstate external/cairo/cairo/san.patch.0
(Instead of just removing any hunks that no longer applied, 86132d8188e5e76623dc8053e5a43c1d69eb0831 "upgrade to cairo 1.17.6" had dropped it completely presumably in error.) Change-Id: I98fe20fc96bd5ce9400b6ad6a9837b21f08cdff0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/cairo/UnpackedTarball_cairo.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index a30285d0a1bd..e746a48994ab 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
external/cairo/cairo/cairo.RGB24_888.patch \
external/cairo/cairo/cairo-libtool-rpath.patch.1 \
external/cairo/cairo/cairo.oldfreetype.patch \
+ external/cairo/cairo/san.patch.0 \
external/cairo/cairo/cairo.ofz46165.patch.1 \
external/cairo/cairo/0025-libtool-pass-use-ld.patch \
))