minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

meson: bump gtk req. Suppress compiler warning.

Browse Source
This commit is contained in:
Logan Rathbone 2021-06-28 23:17:46 -04:00
parent d1a5cd3b91
commit 8d343b714f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -49,7 +49,11 @@ foreach h : check_headers
cc.has_header(h, required: true) cc.has_header(h, required: true)
endforeach endforeach
gtk_dep = dependency('gtk+-3.0', version: '>= 3.0.0') gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0')
# this is the minimum required glib according to the above-mentioned version of gtk
# it's really just being documented here for ease of reference.
glib_dep = dependency('glib-2.0', version: '>= 2.43.4')
# Optional dependencies # Optional dependencies

2
src/text.c
View File

@ -289,11 +289,13 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
if (text_data->no_wrap) if (text_data->no_wrap)
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (text_data->font) { if (text_data->font) {
PangoFontDescription *fontDesc = PangoFontDescription *fontDesc =
pango_font_description_from_string (text_data->font); pango_font_description_from_string (text_data->font);
gtk_widget_override_font (GTK_WIDGET (text_view), fontDesc); gtk_widget_override_font (GTK_WIDGET (text_view), fontDesc);
} }
G_GNUC_END_IGNORE_DEPRECATIONS
if (text_data->uri) if (text_data->uri)
zenity_util_fill_file_buffer (text_buffer, text_data->uri); zenity_util_fill_file_buffer (text_buffer, text_data->uri);