From 08fc49843f2893a89b97c8e5f522d31a182bc282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 31 Aug 2022 10:35:46 +0100 Subject: [PATCH] document attempt to upstream cairo patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If3fc80931a544030a6cef97978f9fed835b4530b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139095 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- external/cairo/UnpackedTarball_cairo.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 5824d0bc0f2d..8353adb32035 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo)) # https://salsa.debian.org/mckinstry/libtool/-/commit/26c23f951d049241128e5e04a7bbc263e5b145f1 # isn't applied, so add that in to avoid: /usr/bin/ld: unrecognized option '--gdb-index' +# ofz50805.patch https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/350 +# ofz46165.patch upstreamed as https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/351 +# san.patch upstreamed as https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/352 + $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ external/cairo/cairo/cairo.buildfix.patch \ external/cairo/cairo/cairo.RGB24_888.patch \