Commit 5fdc69ef authored by Guido Gunther's avatar Guido Gunther Committed by Guido Gunther
Browse files

Bump glib requirement to 2.62



This is in byzantium/bullseye and will allow us to use
g_clear_signal_handler() and friends.
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
parent 9c46c02b
......@@ -27,11 +27,12 @@ configure_file(
configuration: config_h,
)
glib_ver = 'GLIB_VERSION_2_58'
glib_ver = 'GLIB_VERSION_2_62'
add_project_arguments([
'-DHAVE_CONFIG_H',
'-DGLIB_VERSION_MIN_REQUIRED=@0@'.format(glib_ver),
'-DGLIB_VERSION_MAX_REQUIRED=@0@'.format(glib_ver),
'-DG_LOG_USE_STRUCTURED',
'-I' + meson.build_root(),
], language: 'c')
......@@ -104,11 +105,11 @@ gnome = import('gnome')
i18n = import('i18n')
gcr_dep = dependency('gcr-3', version: '>= 3.7.5')
gio_dep = dependency('gio-2.0', version: '>=2.58')
gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.58')
glib_dep = dependency('glib-2.0', version: '>=2.58')
gio_dep = dependency('gio-2.0', version: '>=2.62')
gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.62')
glib_dep = dependency('glib-2.0', version: '>=2.62')
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26')
gobject_dep = dependency('gobject-2.0', version: '>=2.50.0')
gobject_dep = dependency('gobject-2.0', version: '>=2.62')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas')
gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22')
......
......@@ -35,7 +35,6 @@ typedef struct _PhoshMountNotification {
G_DEFINE_TYPE (PhoshMountNotification, phosh_mount_notification, PHOSH_TYPE_NOTIFICATION)
#if GLIB_CHECK_VERSION(2,60,0)
static void
on_launch_finished (GAppInfo *source,
GAsyncResult *result,
......@@ -51,7 +50,7 @@ on_launch_finished (GAppInfo *source,
g_object_unref (self);
}
#endif
static void
phosh_mount_notification_do_action (PhoshNotification *notification, guint id, const char *action)
......@@ -70,7 +69,6 @@ phosh_mount_notification_do_action (PhoshNotification *notification, guint id, c
l = g_list_append (l, (gpointer)action);
context = phosh_shell_get_app_launch_context (phosh_shell_get_default ());
#if GLIB_CHECK_VERSION(2,60,0)
self->cancellable = g_cancellable_new ();
g_app_info_launch_uris_async (info,
l,
......@@ -78,19 +76,6 @@ phosh_mount_notification_do_action (PhoshNotification *notification, guint id, c
self->cancellable,
(GAsyncReadyCallback)on_launch_finished,
g_object_ref (self));
#else
{
g_autoptr (GError) err = NULL;
if (!g_app_info_launch_uris (info,
l,
G_APP_LAUNCH_CONTEXT (context),
&err)) {
g_warning ("Failed to open %s: %s",
phosh_notification_get_summary (PHOSH_NOTIFICATION (self)),
err->message);
}
}
#endif
}
......
......@@ -44,11 +44,7 @@ test_phosh_media_player_new (TestFixture *fixture, gconstpointer data)
g_timeout_add_seconds (1, (GSourceFunc)on_timeout, fixture->mainloop);
g_main_loop_run (fixture->mainloop);
#if GLIB_CHECK_VERSION(2,62,0)
g_assert_finalize_object (widget);
#else
g_object_unref (widget);
#endif
}
int
......
......@@ -216,11 +216,7 @@ phosh_test_compositor_free (PhoshTestCompositorState *state)
kill (state->pid, SIGTERM);
g_spawn_close_pid (state->pid);
#if GLIB_CHECK_VERSION(2,62,0)
g_assert_finalize_object (state->wl);
#else
g_object_unref (state->wl);
#endif
g_clear_pointer (&state, g_free);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment