Skip to content

Remove upstreamed Cairo patch#1560

Merged
nacho merged 1 commit intomainfrom
remove-upstream-cairo-patch
Mar 31, 2025
Merged

Remove upstreamed Cairo patch#1560
nacho merged 1 commit intomainfrom
remove-upstream-cairo-patch

Conversation

@danyeaw
Copy link
Member

@danyeaw danyeaw commented Mar 28, 2025

This patch was upstreamed with https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/520 and released in Cairo 1.18.2. The patch wasn't failing, instead it was creating a 2nd include line a few lines down:

#include <string.h>

#ifdef _MSC_VER
#include <malloc.h>
#endif

#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif

#ifdef _MSC_VER
#include <malloc.h>
#endif

#if HAVE_FT_COLR_V1

@danyeaw danyeaw requested review from nacho and pbor March 31, 2025 13:20
@nacho nacho merged commit fd73eb8 into main Mar 31, 2025
8 checks passed
@nacho nacho deleted the remove-upstream-cairo-patch branch March 31, 2025 13:26
@nacho
Copy link
Contributor

nacho commented Mar 31, 2025

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants