[vte] build: Require GLib 2.44 and GTK 3.20



commit bc041e78cd287b75be5b82d1c58364a29986cd44
Author: Egmont Koblinger <egmont gmail com>
Date:   Sat Sep 14 21:40:08 2019 +0200

    build: Require GLib 2.44 and GTK 3.20
    
    https://gitlab.gnome.org/GNOME/vte/issues/170

 meson.build           |  6 +++---
 src/app/app.cc        |  6 ------
 src/pty.cc            |  4 ----
 src/vte/vtepty.h      |  2 --
 src/vte/vteregex.h    |  2 --
 src/vte/vteterminal.h |  2 --
 src/vtegtk.cc         | 14 --------------
 7 files changed, 3 insertions(+), 33 deletions(-)
---
diff --git a/meson.build b/meson.build
index 218fdf51..d3bc5dcf 100644
--- a/meson.build
+++ b/meson.build
@@ -31,12 +31,12 @@ project(
 
 # Requirements
 
-gtk3_req_version          = '3.8.0'
+gtk3_req_version          = '3.20.0'
 gtk4_req_version          = '4.0.0'
 
 fribidi_req_version       = '1.0.0'
-gio_req_version           = '2.40.0'
-glib_req_version          = '2.40.0'
+gio_req_version           = '2.44.0'
+glib_req_version          = '2.44.0'
 gnutls_req_version        = '3.2.7'
 pango_req_version         = '1.22.0'
 pcre2_req_version         = '10.21'
diff --git a/src/app/app.cc b/src/app/app.cc
index d845b5ce..d7ed9b04 100644
--- a/src/app/app.cc
+++ b/src/app/app.cc
@@ -723,10 +723,8 @@ vteapp_search_popover_init(VteappSearchPopover* popover)
                                popover->revealer, "reveal-child",
                                GBindingFlags(G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE));
 
-#if GTK_CHECK_VERSION(3, 16, 0)
         g_signal_connect_swapped(popover->search_entry, "next-match", 
G_CALLBACK(vteapp_search_popover_search_forward), popover);
         g_signal_connect_swapped(popover->search_entry, "previous-match", 
G_CALLBACK(vteapp_search_popover_search_backward), popover);
-#endif
         g_signal_connect_swapped(popover->search_entry, "search-changed", 
G_CALLBACK(vteapp_search_popover_update_regex), popover);
 
         g_signal_connect_swapped(popover->search_next_button,"clicked", 
G_CALLBACK(vteapp_search_popover_search_forward), popover);
@@ -1096,11 +1094,7 @@ vteapp_window_update_geometry(VteappWindow* window)
                         geometry.min_height = geometry.base_height + cell_height * MIN_ROWS;
 
                         gtk_window_set_geometry_hints(GTK_WINDOW(window),
-#if GTK_CHECK_VERSION (3, 19, 5)
                                                       nullptr,
-#else
-                                                      terminal_widget,
-#endif
                                                       &geometry,
                                                       GdkWindowHints(GDK_HINT_RESIZE_INC |
                                                                      GDK_HINT_MIN_SIZE |
diff --git a/src/pty.cc b/src/pty.cc
index 6dd60345..8879d2e9 100644
--- a/src/pty.cc
+++ b/src/pty.cc
@@ -79,10 +79,6 @@
 
 #define VTE_TERMINFO_NAME "xterm-256color"
 
-#if !GLIB_CHECK_VERSION(2, 42, 0)
-#define G_PARAM_EXPLICIT_NOTIFY 0
-#endif
-
 #define I_(string) (g_intern_static_string(string))
 
 typedef struct _VtePtyPrivate VtePtyPrivate;
diff --git a/src/vte/vtepty.h b/src/vte/vtepty.h
index 17c9721e..3b7aac9e 100644
--- a/src/vte/vtepty.h
+++ b/src/vte/vtepty.h
@@ -91,9 +91,7 @@ gboolean vte_pty_set_utf8 (VtePty *pty,
                            gboolean utf8,
                            GError **error) _VTE_GNUC_NONNULL(1);
 
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VtePty, g_object_unref)
-#endif
 
 _VTE_PUBLIC
 void vte_pty_spawn_async(VtePty *pty,
diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h
index f420a1fe..9001d443 100644
--- a/src/vte/vteregex.h
+++ b/src/vte/vteregex.h
@@ -74,9 +74,7 @@ char *vte_regex_substitute(VteRegex *regex,
                            guint32 flags,
                            GError **error) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2) _VTE_GNUC_NONNULL(3) 
G_GNUC_MALLOC;
 
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VteRegex, vte_regex_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 18ac0714..9d151729 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -486,9 +486,7 @@ gboolean vte_terminal_write_contents_sync (VteTerminal *terminal,
                                            GCancellable *cancellable,
                                            GError **error) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VteTerminal, g_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index c18a178a..a4ac8882 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -58,10 +58,6 @@
 #include "vtegtk.hh"
 #include "vteregexinternal.hh"
 
-#if !GLIB_CHECK_VERSION(2, 42, 0)
-#define G_PARAM_EXPLICIT_NOTIFY 0
-#endif
-
 #define I_(string) (g_intern_static_string(string))
 
 #define VTE_TERMINAL_CSS_NAME "vte-terminal"
@@ -726,13 +722,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
        widget_class->size_allocate = vte_terminal_size_allocate;
         widget_class->screen_changed = vte_terminal_screen_changed;
 
-#if GTK_CHECK_VERSION(3, 19, 5)
         gtk_widget_class_set_css_name(widget_class, VTE_TERMINAL_CSS_NAME);
-#else
-        /* Bug #763538 */
-        if (gtk_check_version(3, 19, 5) == nullptr)
-                g_printerr("VTE needs to be recompiled against a newer gtk+ version.\n");
-#endif
 
        /* Initialize default handlers. */
        klass->eof = NULL;
@@ -4111,11 +4101,7 @@ vte_terminal_set_geometry_hints_for_window(VteTerminal *terminal,
 
         vte_terminal_get_geometry_hints(terminal, &hints, MIN_ROWS, MIN_COLUMNS);
         gtk_window_set_geometry_hints(window,
-#if GTK_CHECK_VERSION (3, 19, 5)
                                       NULL,
-#else
-                                      &terminal->widget,
-#endif
                                       &hints,
                                       (GdkWindowHints)(GDK_HINT_RESIZE_INC |
                                                        GDK_HINT_MIN_SIZE |


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