diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-31 10:35:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-31 14:14:05 +0200 |
| commit | 08fc49843f2893a89b97c8e5f522d31a182bc282 (patch) | |
| tree | 4b40cc4f1dd98a99251480c8c74694e865e65281 /external | |
| parent | ab157ab93e0c5a62927947a8d2b0c1c277e526ac (diff) | |
document attempt to upstream cairo patches
Change-Id: If3fc80931a544030a6cef97978f9fed835b4530b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139095
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 4 |
1 files changed, 4 insertions, 0 deletions
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 \ |