From abea30a3858e4f02cf4a782af36a0b6a3d1747a3 Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Sat, 4 Feb 2023 17:56:48 +0100 Subject: [PATCH] cairo: remove patches They are now upstream --- .../patches/cairo/0001-dwrite-toy-fonts.patch | 30 ---------------- .../0002-fix-scaled-font-hash-lookup.patch | 36 ------------------- gvsbuild/projects/cairo.py | 4 --- 3 files changed, 70 deletions(-) delete mode 100644 gvsbuild/patches/cairo/0001-dwrite-toy-fonts.patch delete mode 100644 gvsbuild/patches/cairo/0002-fix-scaled-font-hash-lookup.patch diff --git a/gvsbuild/patches/cairo/0001-dwrite-toy-fonts.patch b/gvsbuild/patches/cairo/0001-dwrite-toy-fonts.patch deleted file mode 100644 index c451b5ce2..000000000 --- a/gvsbuild/patches/cairo/0001-dwrite-toy-fonts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 36d75971dde8dffd80311b0e67de53b5dd919e3b Mon Sep 17 00:00:00 2001 -From: Adrian Johnson -Date: Sun, 20 Mar 2022 11:15:12 +1030 -Subject: [PATCH] Ensure DWrite toy fonts can not fail if font name not found - ---- - src/win32/cairo-dwrite-font.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/win32/cairo-dwrite-font.cpp b/src/win32/cairo-dwrite-font.cpp -index afa859fbd..575d46642 100644 ---- a/src/win32/cairo-dwrite-font.cpp -+++ b/src/win32/cairo-dwrite-font.cpp -@@ -327,8 +327,12 @@ _cairo_dwrite_font_face_create_for_toy (cairo_toy_font_face_t *toy_face, - IDWriteFontFamily *family = DWriteFactory::FindSystemFontFamily(face_name); - delete face_name; - if (!family) { -- *font_face = (cairo_font_face_t*)&_cairo_font_face_nil; -- return CAIRO_STATUS_FONT_TYPE_MISMATCH; -+ /* If the family is not found, pick a default that should work to avoid failing. */ -+ family = DWriteFactory::FindSystemFontFamily(L"Arial"); -+ if (!family) { -+ *font_face = (cairo_font_face_t*)&_cairo_font_face_nil; -+ return CAIRO_STATUS_FONT_TYPE_MISMATCH; -+ } - } - - DWRITE_FONT_WEIGHT weight; --- -GitLab diff --git a/gvsbuild/patches/cairo/0002-fix-scaled-font-hash-lookup.patch b/gvsbuild/patches/cairo/0002-fix-scaled-font-hash-lookup.patch deleted file mode 100644 index c8b14607c..000000000 --- a/gvsbuild/patches/cairo/0002-fix-scaled-font-hash-lookup.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 90938531a9fe0fef1873c790d648bd0410cdf72e Mon Sep 17 00:00:00 2001 -From: Luca Bacci -Date: Sat, 3 Sep 2022 17:29:51 +0200 -Subject: [PATCH] Fix scaled_glyph hash lookup on Win64 - -Backport of https://gitlab.freedesktop.org/cairo/cairo/-/commit/1cc23206bde186d4aef948bba11e591120c99dcd -to 1.17.6 ---- - src/cairo-scaled-font.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c -index e0b586589..30611dca4 100755 ---- a/src/cairo-scaled-font.c -+++ b/src/cairo-scaled-font.c -@@ -3001,6 +3001,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font, - cairo_int_status_t status = CAIRO_INT_STATUS_SUCCESS; - cairo_scaled_glyph_t *scaled_glyph; - cairo_scaled_glyph_info_t need_info; -+ cairo_hash_entry_t key; - - *scaled_glyph_ret = NULL; - -@@ -3019,8 +3020,8 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font, - /* - * Check cache for glyph - */ -- scaled_glyph = _cairo_hash_table_lookup (scaled_font->glyphs, -- (cairo_hash_entry_t *) &index); -+ key.hash = index; -+ scaled_glyph = _cairo_hash_table_lookup (scaled_font->glyphs, &key); - if (scaled_glyph == NULL) { - status = _cairo_scaled_font_allocate_glyph (scaled_font, &scaled_glyph); - if (unlikely (status)) --- -2.36.1.windows.1 diff --git a/gvsbuild/projects/cairo.py b/gvsbuild/projects/cairo.py index 791b0e81a..7a26ebe5e 100644 --- a/gvsbuild/projects/cairo.py +++ b/gvsbuild/projects/cairo.py @@ -30,10 +30,6 @@ def __init__(self): archive_url="https://gitlab.freedesktop.org/cairo/cairo/-/archive/{version}/cairo-{version}.tar.gz", hash="b4ed6d33037171d4c6594345b42d81796f335a6995fdf5638db0d306c17a0d3e", dependencies=["fontconfig", "freetype", "glib", "pixman", "libpng"], - patches=[ - "0001-dwrite-toy-fonts.patch", - "0002-fix-scaled-font-hash-lookup.patch", - ], ) def build(self):