AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 10:20:07 +00:00
Code Issues Projects Releases Wiki Activity

Bump the pango dep

Browse Source 
Require pango 1.52, and drop the fallback code.

Fixes: #6554
This commit is contained in:
Matthias Clasen 2024-04-04 00:56:24 +02:00
parent a508860d1f
commit 23a336df0e
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gsk/gskprivate.c
View File

@ -51,12 +51,6 @@ gsk_reload_font (PangoFont *font,
static cairo_font_options_t *options = NULL; static cairo_font_options_t *options = NULL;
static PangoContext *context = NULL; static PangoContext *context = NULL;
cairo_scaled_font_t *sf; cairo_scaled_font_t *sf;
#if !PANGO_VERSION_CHECK (1, 52, 0)
PangoFontDescription *desc;
FcPattern *pattern;
double dpi;
int size;
#endif
/* These requests often come in sequentially so keep the result /* These requests often come in sequentially so keep the result
* around and re-use it if everything matches. * around and re-use it if everything matches.
@ -119,22 +113,7 @@ gsk_reload_font (PangoFont *font,
pango_cairo_context_set_font_options (context, options); pango_cairo_context_set_font_options (context, options);
#if PANGO_VERSION_CHECK (1, 52, 0)
last_result = pango_font_map_reload_font (pango_font_get_font_map (font), font, scale, context, NULL); last_result = pango_font_map_reload_font (pango_font_get_font_map (font), font, scale, context, NULL);
#else
#ifdef HAVE_PANGOFT
pattern = pango_fc_font_get_pattern (PANGO_FC_FONT (font));
if (FcPatternGetDouble (pattern, FC_DPI, 0, &dpi) == FcResultMatch)
pango_cairo_context_set_resolution (context, dpi);
#endif
desc = pango_font_describe_with_absolute_size (font);
size = pango_font_description_get_size (desc);
pango_font_description_set_absolute_size (desc, size * scale);
last_result = pango_font_map_load_font (pango_font_get_font_map (font), context, desc);
pango_font_description_free (desc);
#endif
return g_object_ref (last_result); return g_object_ref (last_result);
} }

2
meson.build
View File

@ -13,7 +13,7 @@ project('gtk', 'c',
# keep these numbers in sync with wrap files where there exist # keep these numbers in sync with wrap files where there exist
glib_req = '>= 2.76.0' glib_req = '>= 2.76.0'
introspection_req = '>= 1.76.0' # keep this in sync with glib introspection_req = '>= 1.76.0' # keep this in sync with glib
pango_req = '>= 1.50.0' # keep this in sync with .gitlab-ci/test-msys.sh pango_req = '>= 1.52.0' # keep this in sync with .gitlab-ci/test-msys.sh
harfbuzz_req = '>= 2.6.0' harfbuzz_req = '>= 2.6.0'
fribidi_req = '>= 1.0.6' fribidi_req = '>= 1.0.6'
cairo_req = '>= 1.14.0' cairo_req = '>= 1.14.0'