[zenity/meson] meson: bump gtk req. Suppress compiler warning.



commit 8d343b714fa4c0aeaa7e639892159aa0d619f124
Author: Logan Rathbone <poprocks gmail com>
Date:   Mon Jun 28 23:17:46 2021 -0400

    meson: bump gtk req. Suppress compiler warning.

 meson.build | 6 +++++-
 src/text.c  | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index f65475a0..20ce5082 100644
--- a/meson.build
+++ b/meson.build
@@ -49,7 +49,11 @@ foreach h : check_headers
   cc.has_header(h, required: true)
 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
 
diff --git a/src/text.c b/src/text.c
index ffe7b35e..bbfa4212 100644
--- a/src/text.c
+++ b/src/text.c
@@ -289,11 +289,13 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
        if (text_data->no_wrap)
                gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
        if (text_data->font) {
                PangoFontDescription *fontDesc =
                        pango_font_description_from_string (text_data->font);
                gtk_widget_override_font (GTK_WIDGET (text_view), fontDesc);
        }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
        if (text_data->uri)
                zenity_util_fill_file_buffer (text_buffer, text_data->uri);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]