Toshaan Bharvani
2 years ago
commit
a71a858acc
10 changed files with 6169 additions and 0 deletions
@ -0,0 +1,855 @@
@@ -0,0 +1,855 @@
|
||||
From 5e42384cc4499293259a8a37a737014a56de34df Mon Sep 17 00:00:00 2001 |
||||
From: Benjamin Berg <bberg@redhat.com> |
||||
Date: Fri, 23 Oct 2020 18:20:01 +0200 |
||||
Subject: [PATCH 1/4] tests: Iterate mainloop during launch test |
||||
|
||||
When launching an application, we wait for the DBus response from |
||||
systemd before executing the binary. Because of this the main loop needs |
||||
to be iterated for spawning to completed and the file to be created. |
||||
|
||||
Without this the test will time out if GLib was able to connect to the |
||||
session bus. |
||||
--- |
||||
gio/tests/desktop-app-info.c | 1 + |
||||
1 file changed, 1 insertion(+) |
||||
|
||||
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c |
||||
index fcc29c579..743230cbb 100644 |
||||
--- a/gio/tests/desktop-app-info.c |
||||
+++ b/gio/tests/desktop-app-info.c |
||||
@@ -334,6 +334,7 @@ wait_for_file (const gchar *want_this, |
||||
*/ |
||||
while (access (want_this, F_OK) != 0) |
||||
{ |
||||
+ g_main_context_iteration (NULL, FALSE); |
||||
g_usleep (100000); /* 100ms */ |
||||
g_assert_cmpuint (retries, >, 0); |
||||
retries--; |
||||
-- |
||||
2.31.1 |
||||
|
||||
From ba3b85a8fea0151e74de50e841a7f16f9b077a56 Mon Sep 17 00:00:00 2001 |
||||
From: Benjamin Berg <bberg@redhat.com> |
||||
Date: Mon, 27 Jul 2020 22:22:32 +0200 |
||||
Subject: [PATCH 2/4] gdesktopappinfo: Move launched applications into |
||||
transient scope |
||||
|
||||
Try to move the spawned executable into its own systemd scope. To avoid |
||||
possible race conditions and ensure proper accounting, we delay the |
||||
execution of the real command until after the DBus call to systemd has |
||||
finished. |
||||
|
||||
From the two approaches we can take here, this is better in the sense |
||||
that we have a child that the API consumer can watch. API consumers |
||||
should not be doing this, however, gnome-session needs to watch children |
||||
during session startup. Until gnome-session is fixed, we will not be |
||||
able to change this. |
||||
|
||||
The alternative approach is to delegate launching itself to systemd by |
||||
creating a transient .service unit instead. This is cleaner and has e.g. |
||||
the advantage that systemd will take care of log redirection and similar |
||||
issues. |
||||
|
||||
Note that this patch is incomplete. The DBus call is done in a "fire and |
||||
forget" manner, which is fine in most cases, but means that "gio open" |
||||
will fail to move the child into the new scope as gio quits before the |
||||
DBus call finishes. |
||||
--- |
||||
gio/gdesktopappinfo.c | 264 ++++++++++++++++++++++++++++++++++++------ |
||||
1 file changed, 227 insertions(+), 37 deletions(-) |
||||
|
||||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c |
||||
index 1a4b97918..afdcd42ac 100644 |
||||
--- a/gio/gdesktopappinfo.c |
||||
+++ b/gio/gdesktopappinfo.c |
||||
@@ -2730,6 +2730,148 @@ notify_desktop_launch (GDBusConnection *session_bus, |
||||
|
||||
#define _SPAWN_FLAGS_DEFAULT (G_SPAWN_SEARCH_PATH) |
||||
|
||||
+#if defined(__linux__) && !defined(__BIONIC__) |
||||
+typedef struct { |
||||
+ int pipe[2]; |
||||
+ GSpawnChildSetupFunc user_setup; |
||||
+ gpointer user_setup_data; |
||||
+} SpawnWrapperData; |
||||
+ |
||||
+static void |
||||
+launch_uris_with_spawn_delay_exec (gpointer user_data) |
||||
+{ |
||||
+ SpawnWrapperData *data = user_data; |
||||
+ |
||||
+ /* Clear CLOEXEC again, as that was set due to |
||||
+ * G_SPAWN_LEAVE_DESCRIPTORS_OPEN not being set. */ |
||||
+ fcntl (data->pipe[0], F_SETFD, 0); |
||||
+ |
||||
+ /* No need to close read side, we have CLOEXEC set. */ |
||||
+ |
||||
+ if (data->user_setup) |
||||
+ data->user_setup (data->user_setup_data); |
||||
+} |
||||
+ |
||||
+static gchar * |
||||
+systemd_unit_name_escape (const gchar *in) |
||||
+{ |
||||
+ /* Adapted from systemd source */ |
||||
+ GString * const str = g_string_sized_new (strlen (in)); |
||||
+ |
||||
+ for (; *in; in++) |
||||
+ { |
||||
+ if (g_ascii_isalnum (*in) || *in == ':' || *in == '_' || *in == '.') |
||||
+ g_string_append_c (str, *in); |
||||
+ else |
||||
+ g_string_append_printf (str, "\\x%02x", *in); |
||||
+ } |
||||
+ return g_string_free (str, FALSE); |
||||
+} |
||||
+ |
||||
+static void |
||||
+create_systemd_scope (GDBusConnection *session_bus, |
||||
+ GDesktopAppInfo *info, |
||||
+ gint pid, |
||||
+ GAsyncReadyCallback callback, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GVariantBuilder builder; |
||||
+ const char *app_name = g_get_application_name (); |
||||
+ char *appid = NULL; |
||||
+ char *appid_escaped = NULL; |
||||
+ char *snid_escaped = NULL; |
||||
+ char *unit_name = NULL; |
||||
+ |
||||
+ /* In this order: |
||||
+ * 1. Actual application ID from file |
||||
+ * 2. Stripping the .desktop from the desktop ID |
||||
+ * 3. Fall back to using the binary name |
||||
+ */ |
||||
+ if (info->app_id) |
||||
+ appid = g_strdup (info->app_id); |
||||
+ else if (info->desktop_id && g_str_has_suffix (info->desktop_id, ".desktop")) |
||||
+ appid = g_strndup (info->desktop_id, strlen (info->desktop_id) - 8); |
||||
+ else |
||||
+ appid = g_path_get_basename (info->binary); |
||||
+ |
||||
+ appid_escaped = systemd_unit_name_escape (appid); |
||||
+ |
||||
+ /* Generate a name conforming to |
||||
+ * https://systemd.io/DESKTOP_ENVIRONMENTS/ |
||||
+ * We use the PID to disambiguate, as that should be unique enough. |
||||
+ */ |
||||
+ unit_name = g_strdup_printf ("app-glib-%s-%d.scope", appid_escaped, pid); |
||||
+ |
||||
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ssa(sv)a(sa(sv)))")); |
||||
+ g_variant_builder_add (&builder, "s", unit_name); |
||||
+ g_variant_builder_add (&builder, "s", "fail"); |
||||
+ |
||||
+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("a(sv)")); |
||||
+ |
||||
+ /* Add a generic human readable description, can be changed at will. */ |
||||
+ if (app_name) |
||||
+ g_variant_builder_add (&builder, |
||||
+ "(sv)", |
||||
+ "Description", |
||||
+ g_variant_new_take_string (g_strdup_printf ("Application launched by %s", |
||||
+ app_name))); |
||||
+ g_variant_builder_add (&builder, |
||||
+ "(sv)", |
||||
+ "PIDs", |
||||
+ g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32, &pid, 1, 4)); |
||||
+ /* Default to let systemd garbage collect failed applications we launched. */ |
||||
+ g_variant_builder_add (&builder, |
||||
+ "(sv)", |
||||
+ "CollectMode", |
||||
+ g_variant_new_string ("inactive-or-failed")); |
||||
+ |
||||
+ g_variant_builder_close (&builder); |
||||
+ |
||||
+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("a(sa(sv))")); |
||||
+ g_variant_builder_close (&builder); |
||||
+ |
||||
+ g_dbus_connection_call (session_bus, |
||||
+ "org.freedesktop.systemd1", |
||||
+ "/org/freedesktop/systemd1", |
||||
+ "org.freedesktop.systemd1.Manager", |
||||
+ "StartTransientUnit", |
||||
+ g_variant_builder_end (&builder), |
||||
+ G_VARIANT_TYPE ("(o)"), |
||||
+ G_DBUS_CALL_FLAGS_NO_AUTO_START, |
||||
+ 1000, |
||||
+ NULL, |
||||
+ callback, |
||||
+ user_data); |
||||
+ |
||||
+ g_free (appid); |
||||
+ g_free (appid_escaped); |
||||
+ g_free (snid_escaped); |
||||
+ g_free (unit_name); |
||||
+} |
||||
+ |
||||
+static void |
||||
+systemd_scope_created_cb (GObject *object, |
||||
+ GAsyncResult *result, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GVariant *res = NULL; |
||||
+ GError *error = NULL; |
||||
+ |
||||
+ res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (object), result, &error); |
||||
+ if (error != NULL) |
||||
+ { |
||||
+ g_debug ("Failed to move new child into scope: %s", error->message); |
||||
+ g_error_free (error); |
||||
+ } |
||||
+ |
||||
+ /* Unblock the waiting wrapper binary. */ |
||||
+ close (GPOINTER_TO_INT (user_data)); |
||||
+ |
||||
+ if (res) |
||||
+ g_variant_unref (res); |
||||
+} |
||||
+#endif |
||||
+ |
||||
static gboolean |
||||
g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
GDBusConnection *session_bus, |
||||
@@ -2750,13 +2892,14 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
GList *old_uris; |
||||
GList *dup_uris; |
||||
|
||||
- char **argv, **envp; |
||||
+ GStrv argv = NULL, envp = NULL; |
||||
+ GStrv wrapped_argv = NULL; |
||||
+ GList *launched_uris = NULL; |
||||
+ char *sn_id = NULL; |
||||
int argc; |
||||
|
||||
g_return_val_if_fail (info != NULL, FALSE); |
||||
|
||||
- argv = NULL; |
||||
- |
||||
if (launch_context) |
||||
envp = g_app_launch_context_get_environment (launch_context); |
||||
else |
||||
@@ -2770,27 +2913,19 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
do |
||||
{ |
||||
GPid pid; |
||||
- GList *launched_uris; |
||||
GList *iter; |
||||
- char *sn_id = NULL; |
||||
- char **wrapped_argv; |
||||
int i; |
||||
- gsize j; |
||||
- const gchar * const wrapper_argv[] = |
||||
- { |
||||
- "/bin/sh", |
||||
- "-e", |
||||
- "-u", |
||||
- "-c", "export GIO_LAUNCHED_DESKTOP_FILE_PID=$$; exec \"$@\"", |
||||
- "sh", /* argv[0] for sh */ |
||||
- }; |
||||
+#if defined(__linux__) && !defined(__BIONIC__) |
||||
+ SpawnWrapperData wrapper_data; |
||||
+#endif |
||||
+ GSpawnChildSetupFunc setup = user_setup; |
||||
+ gpointer setup_data = user_setup_data; |
||||
|
||||
old_uris = dup_uris; |
||||
if (!expand_application_parameters (info, exec_line, &dup_uris, &argc, &argv, error)) |
||||
- goto out; |
||||
+ return FALSE; |
||||
|
||||
/* Get the subset of URIs we're launching with this process */ |
||||
- launched_uris = NULL; |
||||
for (iter = old_uris; iter != NULL && iter != dup_uris; iter = iter->next) |
||||
launched_uris = g_list_prepend (launched_uris, iter->data); |
||||
launched_uris = g_list_reverse (launched_uris); |
||||
@@ -2799,7 +2934,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
{ |
||||
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
_("Unable to find terminal required for application")); |
||||
- goto out; |
||||
+ return FALSE; |
||||
} |
||||
|
||||
if (info->filename) |
||||
@@ -2808,7 +2943,6 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
info->filename, |
||||
TRUE); |
||||
|
||||
- sn_id = NULL; |
||||
if (launch_context) |
||||
{ |
||||
GList *launched_files = create_files_for_uris (launched_uris); |
||||
@@ -2837,38 +2971,93 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
* with a wrapper program (grep the GLib git history for |
||||
* `gio-launch-desktop` for an example of this which could be |
||||
* resurrected). */ |
||||
- wrapped_argv = g_new (char *, argc + G_N_ELEMENTS (wrapper_argv) + 1); |
||||
+ wrapped_argv = g_new (char *, argc + 6 + 1); |
||||
+ |
||||
+ wrapped_argv[0] = g_strdup ("/bin/sh"); |
||||
+ wrapped_argv[1] = g_strdup ("-e"); |
||||
+ wrapped_argv[2] = g_strdup ("-u"); |
||||
+ wrapped_argv[3] = g_strdup ("-c"); |
||||
+ /* argument 4 is filled in below */ |
||||
+ wrapped_argv[5] = g_strdup ("sh"); |
||||
|
||||
- for (j = 0; j < G_N_ELEMENTS (wrapper_argv); j++) |
||||
- wrapped_argv[j] = g_strdup (wrapper_argv[j]); |
||||
for (i = 0; i < argc; i++) |
||||
- wrapped_argv[i + G_N_ELEMENTS (wrapper_argv)] = g_steal_pointer (&argv[i]); |
||||
+ wrapped_argv[i + 6] = g_steal_pointer (&argv[i]); |
||||
+ |
||||
+ wrapped_argv[i + 6] = NULL; |
||||
+ g_clear_pointer (&argv, g_free); |
||||
+ |
||||
+#if defined(__linux__) && !defined(__BIONIC__) |
||||
+ /* Create pipes, if we use a setup func, then set cloexec, |
||||
+ * otherwise our wrapper script will close both sides. */ |
||||
+ if (!g_unix_open_pipe (wrapper_data.pipe, 0, NULL)) |
||||
+ { |
||||
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
+ _("Unable to create pipe for systemd synchronization")); |
||||
+ return FALSE; |
||||
+ } |
||||
+ |
||||
+ /* Set CLOEXEC on the write pipe, so we don't need to deal with it in the child. */ |
||||
+ fcntl (wrapper_data.pipe[1], F_SETFD, FD_CLOEXEC); |
||||
|
||||
- wrapped_argv[i + G_N_ELEMENTS (wrapper_argv)] = NULL; |
||||
- g_free (argv); |
||||
- argv = NULL; |
||||
+ if (!(spawn_flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN)) |
||||
+ { |
||||
+ /* In this case, we use a setup function (which could probably also |
||||
+ * overwrite envp to set GIO_LAUNCHED_DESKTOP_FILE_PID). |
||||
+ * |
||||
+ * Note that this does not incur an additional cost because |
||||
+ * G_SPAWN_LEAVE_DESCRIPTOR_OPEN must be set in order to use |
||||
+ * posix_spawn. */ |
||||
+ wrapper_data.user_setup = setup; |
||||
+ wrapper_data.user_setup_data = setup_data; |
||||
+ |
||||
+ setup = launch_uris_with_spawn_delay_exec; |
||||
+ setup_data = &wrapper_data; |
||||
+ } |
||||
+ |
||||
+ wrapped_argv[4] = g_strdup_printf ("export GIO_LAUNCHED_DESKTOP_FILE_PID=$$; cat <&%1$d; exec \"$@\" %1$d<&-", |
||||
+ wrapper_data.pipe[0]); |
||||
+#else |
||||
+ wrapped_argv[4] = g_strdup ("export GIO_LAUNCHED_DESKTOP_FILE_PID=$$; exec \"$@\""); |
||||
+#endif |
||||
|
||||
if (!g_spawn_async_with_fds (info->path, |
||||
wrapped_argv, |
||||
envp, |
||||
spawn_flags, |
||||
- user_setup, |
||||
- user_setup_data, |
||||
+ setup, |
||||
+ setup_data, |
||||
&pid, |
||||
stdin_fd, |
||||
stdout_fd, |
||||
stderr_fd, |
||||
error)) |
||||
{ |
||||
+#if defined(__linux__) && !defined(__BIONIC__) |
||||
+ close (wrapper_data.pipe[0]); |
||||
+ close (wrapper_data.pipe[1]); |
||||
+#endif |
||||
+ |
||||
if (sn_id) |
||||
g_app_launch_context_launch_failed (launch_context, sn_id); |
||||
|
||||
- g_free (sn_id); |
||||
- g_list_free (launched_uris); |
||||
- |
||||
goto out; |
||||
} |
||||
|
||||
+#if defined(__linux__) && !defined(__BIONIC__) |
||||
+ /* We close write side asynchronously later on when the dbus call |
||||
+ * to systemd finishes. */ |
||||
+ close (wrapper_data.pipe[0]); |
||||
+ |
||||
+ if (session_bus) |
||||
+ create_systemd_scope (session_bus, |
||||
+ info, |
||||
+ pid, |
||||
+ systemd_scope_created_cb, |
||||
+ GINT_TO_POINTER (wrapper_data.pipe[1])); |
||||
+ else |
||||
+ close (wrapper_data.pipe[1]); |
||||
+#endif |
||||
+ |
||||
if (pid_callback != NULL) |
||||
pid_callback (info, pid, pid_callback_data); |
||||
|
||||
@@ -2893,19 +3082,20 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
sn_id, |
||||
launched_uris); |
||||
|
||||
- g_free (sn_id); |
||||
- g_list_free (launched_uris); |
||||
- |
||||
- g_strfreev (wrapped_argv); |
||||
- wrapped_argv = NULL; |
||||
+ g_clear_pointer (&sn_id, g_free); |
||||
+ g_clear_pointer (&launched_uris, g_list_free); |
||||
+ g_clear_pointer (&wrapped_argv, g_strfreev); |
||||
} |
||||
while (dup_uris != NULL); |
||||
|
||||
completed = TRUE; |
||||
|
||||
- out: |
||||
+out: |
||||
g_strfreev (argv); |
||||
g_strfreev (envp); |
||||
+ g_clear_pointer (&wrapped_argv, g_strfreev); |
||||
+ g_list_free (launched_uris); |
||||
+ g_free (sn_id); |
||||
|
||||
return completed; |
||||
} |
||||
-- |
||||
2.31.1 |
||||
|
||||
From cd67a1b0256d2397dac0836e154f3449b63a6b19 Mon Sep 17 00:00:00 2001 |
||||
From: Benjamin Berg <bberg@redhat.com> |
||||
Date: Tue, 28 Jul 2020 12:11:13 +0200 |
||||
Subject: [PATCH 3/4] gdesktopappinfo: Handle task completion from spawn |
||||
function |
||||
|
||||
This allows delaying the return of the task until all dbus calls (in |
||||
particular the ones to setup the scope) have finished. |
||||
|
||||
This fixes the behaviour of the previous commit which would not |
||||
correctly move the process into the scope if the application exited |
||||
right after the task returned. |
||||
--- |
||||
gio/gdesktopappinfo.c | 212 +++++++++++++++++++++++++++++------------- |
||||
1 file changed, 146 insertions(+), 66 deletions(-) |
||||
|
||||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c |
||||
index afdcd42ac..8d0f1688e 100644 |
||||
--- a/gio/gdesktopappinfo.c |
||||
+++ b/gio/gdesktopappinfo.c |
||||
@@ -2849,11 +2849,17 @@ create_systemd_scope (GDBusConnection *session_bus, |
||||
g_free (unit_name); |
||||
} |
||||
|
||||
+typedef struct { |
||||
+ GTask *task; |
||||
+ int fd; |
||||
+} ScopeCreatedData; |
||||
+ |
||||
static void |
||||
systemd_scope_created_cb (GObject *object, |
||||
GAsyncResult *result, |
||||
gpointer user_data) |
||||
{ |
||||
+ ScopeCreatedData *data = user_data; |
||||
GVariant *res = NULL; |
||||
GError *error = NULL; |
||||
|
||||
@@ -2865,13 +2871,47 @@ systemd_scope_created_cb (GObject *object, |
||||
} |
||||
|
||||
/* Unblock the waiting wrapper binary. */ |
||||
- close (GPOINTER_TO_INT (user_data)); |
||||
+ |
||||
+ close (data->fd); |
||||
+ |
||||
+ if (data->task) |
||||
+ { |
||||
+ gint pending; |
||||
+ pending = GPOINTER_TO_INT (g_task_get_task_data (data->task)); |
||||
+ pending -= 1; |
||||
+ g_task_set_task_data (data->task, GINT_TO_POINTER (pending), NULL); |
||||
+ |
||||
+ if (pending == 0 && !g_task_get_completed (data->task)) |
||||
+ g_task_return_boolean (data->task, TRUE); |
||||
+ } |
||||
|
||||
if (res) |
||||
g_variant_unref (res); |
||||
+ g_clear_object (&data->task); |
||||
+ g_free (data); |
||||
} |
||||
#endif |
||||
|
||||
+static void |
||||
+launch_uris_with_spawn_flush_cb (GObject *object, |
||||
+ GAsyncResult *result, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GTask *task = G_TASK (user_data); |
||||
+ gint pending; |
||||
+ |
||||
+ g_dbus_connection_flush_finish (G_DBUS_CONNECTION (object), result, NULL); |
||||
+ |
||||
+ pending = GPOINTER_TO_INT (g_task_get_task_data (task)); |
||||
+ pending -= 1; |
||||
+ g_task_set_task_data (task, GINT_TO_POINTER (pending), NULL); |
||||
+ |
||||
+ if (pending == 0 && !g_task_get_completed (task)) |
||||
+ g_task_return_boolean (task, TRUE); |
||||
+ |
||||
+ g_object_unref (task); |
||||
+} |
||||
+ |
||||
static gboolean |
||||
g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
GDBusConnection *session_bus, |
||||
@@ -2886,9 +2926,10 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
gint stdin_fd, |
||||
gint stdout_fd, |
||||
gint stderr_fd, |
||||
- GError **error) |
||||
+ GTask *task, |
||||
+ GError **error_out) |
||||
{ |
||||
- gboolean completed = FALSE; |
||||
+ GError *error = NULL; |
||||
GList *old_uris; |
||||
GList *dup_uris; |
||||
|
||||
@@ -2898,8 +2939,15 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
char *sn_id = NULL; |
||||
int argc; |
||||
|
||||
+ /* We may get a task to report back on or an error. But never both. */ |
||||
+ g_assert (!(task && error_out)); |
||||
g_return_val_if_fail (info != NULL, FALSE); |
||||
|
||||
+ /* Surrounding code must not have set any data on the task |
||||
+ * (it is cleared before calling this function). */ |
||||
+ if (session_bus && task) |
||||
+ g_assert (g_task_get_task_data (task) == NULL); |
||||
+ |
||||
if (launch_context) |
||||
envp = g_app_launch_context_get_environment (launch_context); |
||||
else |
||||
@@ -2922,8 +2970,8 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
gpointer setup_data = user_setup_data; |
||||
|
||||
old_uris = dup_uris; |
||||
- if (!expand_application_parameters (info, exec_line, &dup_uris, &argc, &argv, error)) |
||||
- return FALSE; |
||||
+ if (!expand_application_parameters (info, exec_line, &dup_uris, &argc, &argv, &error)) |
||||
+ goto out; |
||||
|
||||
/* Get the subset of URIs we're launching with this process */ |
||||
for (iter = old_uris; iter != NULL && iter != dup_uris; iter = iter->next) |
||||
@@ -2932,9 +2980,9 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
|
||||
if (info->terminal && !prepend_terminal_to_vector (&argc, &argv)) |
||||
{ |
||||
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
- _("Unable to find terminal required for application")); |
||||
- return FALSE; |
||||
+ error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
+ _("Unable to find terminal required for application")); |
||||
+ goto out; |
||||
} |
||||
|
||||
if (info->filename) |
||||
@@ -2991,9 +3039,9 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
* otherwise our wrapper script will close both sides. */ |
||||
if (!g_unix_open_pipe (wrapper_data.pipe, 0, NULL)) |
||||
{ |
||||
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
- _("Unable to create pipe for systemd synchronization")); |
||||
- return FALSE; |
||||
+ error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, |
||||
+ _("Unable to create pipe for systemd synchronization")); |
||||
+ goto out; |
||||
} |
||||
|
||||
/* Set CLOEXEC on the write pipe, so we don't need to deal with it in the child. */ |
||||
@@ -3030,7 +3078,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
stdin_fd, |
||||
stdout_fd, |
||||
stderr_fd, |
||||
- error)) |
||||
+ &error)) |
||||
{ |
||||
#if defined(__linux__) && !defined(__BIONIC__) |
||||
close (wrapper_data.pipe[0]); |
||||
@@ -3049,11 +3097,29 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
close (wrapper_data.pipe[0]); |
||||
|
||||
if (session_bus) |
||||
- create_systemd_scope (session_bus, |
||||
- info, |
||||
- pid, |
||||
- systemd_scope_created_cb, |
||||
- GINT_TO_POINTER (wrapper_data.pipe[1])); |
||||
+ { |
||||
+ ScopeCreatedData *data; |
||||
+ |
||||
+ data = g_new0 (ScopeCreatedData, 1); |
||||
+ |
||||
+ if (task) |
||||
+ { |
||||
+ gint pending; |
||||
+ pending = GPOINTER_TO_INT (g_task_get_task_data (task)); |
||||
+ pending += 1; |
||||
+ g_task_set_task_data (task, GINT_TO_POINTER (pending), NULL); |
||||
+ |
||||
+ data->task = g_object_ref (task); |
||||
+ } |
||||
+ |
||||
+ data->fd = wrapper_data.pipe[1]; |
||||
+ |
||||
+ create_systemd_scope (session_bus, |
||||
+ info, |
||||
+ pid, |
||||
+ systemd_scope_created_cb, |
||||
+ data); |
||||
+ } |
||||
else |
||||
close (wrapper_data.pipe[1]); |
||||
#endif |
||||
@@ -3088,8 +3154,6 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, |
||||
} |
||||
while (dup_uris != NULL); |
||||
|
||||
- completed = TRUE; |
||||
- |
||||
out: |
||||
g_strfreev (argv); |
||||
g_strfreev (envp); |
||||
@@ -3097,7 +3161,52 @@ out: |
||||
g_list_free (launched_uris); |
||||
g_free (sn_id); |
||||
|
||||
- return completed; |
||||
+ if (!error) |
||||
+ { |
||||
+ if (session_bus && task) |
||||
+ { |
||||
+ GCancellable *cancellable = g_task_get_cancellable (task); |
||||
+ gint pending; |
||||
+ pending = GPOINTER_TO_INT (g_task_get_task_data (task)); |
||||
+ pending += 1; |
||||
+ g_task_set_task_data (task, GINT_TO_POINTER (pending), NULL); |
||||
+ |
||||
+ /* FIXME: The D-Bus message from the notify_desktop_launch() function |
||||
+ * can be still lost even if flush is called later. See: |
||||
+ * https://gitlab.freedesktop.org/dbus/dbus/issues/72 |
||||
+ */ |
||||
+ g_dbus_connection_flush (session_bus, |
||||
+ cancellable, |
||||
+ launch_uris_with_spawn_flush_cb, |
||||
+ g_steal_pointer (&task)); |
||||
+ } |
||||
+ else if (session_bus) |
||||
+ { |
||||
+ /* No task available. */ |
||||
+ g_dbus_connection_flush (session_bus, |
||||
+ NULL, |
||||
+ NULL, |
||||
+ NULL); |
||||
+ } |
||||
+ else if (task) |
||||
+ { |
||||
+ /* Return the given task. */ |
||||
+ g_task_return_boolean (task, TRUE); |
||||
+ g_object_unref (task); |
||||
+ } |
||||
+ } |
||||
+ else |
||||
+ { |
||||
+ if (task) |
||||
+ { |
||||
+ g_task_return_error (task, error); |
||||
+ g_object_unref (task); |
||||
+ } |
||||
+ else |
||||
+ g_propagate_error (error_out, error); |
||||
+ } |
||||
+ |
||||
+ return !error; |
||||
} |
||||
|
||||
static gchar * |
||||
@@ -3246,17 +3355,9 @@ g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo, |
||||
success = g_desktop_app_info_launch_uris_with_spawn (info, session_bus, info->exec, uris, launch_context, |
||||
spawn_flags, user_setup, user_setup_data, |
||||
pid_callback, pid_callback_data, |
||||
- stdin_fd, stdout_fd, stderr_fd, error); |
||||
+ stdin_fd, stdout_fd, stderr_fd, NULL, error); |
||||
|
||||
- if (session_bus != NULL) |
||||
- { |
||||
- /* This asynchronous flush holds a reference until it completes, |
||||
- * which ensures that the following unref won't immediately kill |
||||
- * the connection if we were the initial owner. |
||||
- */ |
||||
- g_dbus_connection_flush (session_bus, NULL, NULL, NULL); |
||||
- g_object_unref (session_bus); |
||||
- } |
||||
+ g_clear_object (&session_bus); |
||||
|
||||
return success; |
||||
} |
||||
@@ -3310,18 +3411,6 @@ launch_uris_with_dbus_cb (GObject *object, |
||||
g_object_unref (task); |
||||
} |
||||
|
||||
-static void |
||||
-launch_uris_flush_cb (GObject *object, |
||||
- GAsyncResult *result, |
||||
- gpointer user_data) |
||||
-{ |
||||
- GTask *task = G_TASK (user_data); |
||||
- |
||||
- g_dbus_connection_flush_finish (G_DBUS_CONNECTION (object), result, NULL); |
||||
- g_task_return_boolean (task, TRUE); |
||||
- g_object_unref (task); |
||||
-} |
||||
- |
||||
static void |
||||
launch_uris_bus_get_cb (GObject *object, |
||||
GAsyncResult *result, |
||||
@@ -3330,12 +3419,20 @@ launch_uris_bus_get_cb (GObject *object, |
||||
GTask *task = G_TASK (user_data); |
||||
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (g_task_get_source_object (task)); |
||||
LaunchUrisData *data = g_task_get_task_data (task); |
||||
+ LaunchUrisData *data_copy = NULL; |
||||
GCancellable *cancellable = g_task_get_cancellable (task); |
||||
GDBusConnection *session_bus; |
||||
- GError *error = NULL; |
||||
|
||||
session_bus = g_bus_get_finish (result, NULL); |
||||
|
||||
+ data_copy = g_new0 (LaunchUrisData, 1); |
||||
+ data_copy->appinfo = g_steal_pointer (&data->appinfo); |
||||
+ data_copy->uris = g_steal_pointer (&data->uris); |
||||
+ data_copy->context = g_steal_pointer (&data->context); |
||||
+ |
||||
+ /* Allow other data to be attached to the task. */ |
||||
+ g_task_set_task_data (task, NULL, NULL); |
||||
+ |
||||
if (session_bus && info->app_id) |
||||
{ |
||||
/* FIXME: The g_document_portal_add_documents() function, which is called |
||||
@@ -3343,34 +3440,21 @@ launch_uris_bus_get_cb (GObject *object, |
||||
* uses blocking calls. |
||||
*/ |
||||
g_desktop_app_info_launch_uris_with_dbus (info, session_bus, |
||||
- data->uris, data->context, |
||||
+ data_copy->uris, data_copy->context, |
||||
cancellable, |
||||
launch_uris_with_dbus_cb, |
||||
g_steal_pointer (&task)); |
||||
} |
||||
else |
||||
{ |
||||
- /* FIXME: The D-Bus message from the notify_desktop_launch() function |
||||
- * can be still lost even if flush is called later. See: |
||||
- * https://gitlab.freedesktop.org/dbus/dbus/issues/72 |
||||
- */ |
||||
g_desktop_app_info_launch_uris_with_spawn (info, session_bus, info->exec, |
||||
- data->uris, data->context, |
||||
+ data_copy->uris, data_copy->context, |
||||
_SPAWN_FLAGS_DEFAULT, NULL, |
||||
NULL, NULL, NULL, -1, -1, -1, |
||||
- &error); |
||||
- if (error != NULL) |
||||
- { |
||||
- g_task_return_error (task, g_steal_pointer (&error)); |
||||
- g_object_unref (task); |
||||
- } |
||||
- else |
||||
- g_dbus_connection_flush (session_bus, |
||||
- cancellable, |
||||
- launch_uris_flush_cb, |
||||
- g_steal_pointer (&task)); |
||||
+ g_steal_pointer (&task), NULL); |
||||
} |
||||
|
||||
+ launch_uris_data_free (data_copy); |
||||
g_clear_object (&session_bus); |
||||
} |
||||
|
||||
@@ -5186,16 +5270,12 @@ g_desktop_app_info_launch_action (GDesktopAppInfo *info, |
||||
if (exec_line) |
||||
g_desktop_app_info_launch_uris_with_spawn (info, session_bus, exec_line, NULL, launch_context, |
||||
_SPAWN_FLAGS_DEFAULT, NULL, NULL, NULL, NULL, |
||||
- -1, -1, -1, NULL); |
||||
+ -1, -1, -1, NULL, NULL); |
||||
|
||||
g_free (exec_line); |
||||
} |
||||
|
||||
- if (session_bus != NULL) |
||||
- { |
||||
- g_dbus_connection_flush (session_bus, NULL, NULL, NULL); |
||||
- g_object_unref (session_bus); |
||||
- } |
||||
+ g_clear_object (&session_bus); |
||||
} |
||||
/* Epilogue {{{1 */ |
||||
|
||||
-- |
||||
2.31.1 |
||||
|
||||
From 8da8a3ef6df8af6de8bd388192bebe8b51b3e782 Mon Sep 17 00:00:00 2001 |
||||
From: Benjamin Berg <bberg@redhat.com> |
||||
Date: Thu, 17 Sep 2020 17:35:58 +0200 |
||||
Subject: [PATCH 4/4] gdesktopappinfo: Add SourcePath= to transient systemd |
||||
units |
||||
|
||||
systemd allows setting a SourcePath= which shows the file that the unit |
||||
has been generated from. KDE is starting to set this and it seems like a |
||||
good idea, so do the same here. |
||||
|
||||
See https://invent.kde.org/frameworks/kio/-/merge_requests/124 |
||||
--- |
||||
gio/gdesktopappinfo.c | 13 +++++++++++++ |
||||
1 file changed, 13 insertions(+) |
||||
|
||||
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c |
||||
index 8d0f1688e..a833de4e6 100644 |
||||
--- a/gio/gdesktopappinfo.c |
||||
+++ b/gio/gdesktopappinfo.c |
||||
@@ -2777,6 +2777,7 @@ create_systemd_scope (GDBusConnection *session_bus, |
||||
{ |
||||
GVariantBuilder builder; |
||||
const char *app_name = g_get_application_name (); |
||||
+ const char *source_path = NULL; |
||||
char *appid = NULL; |
||||
char *appid_escaped = NULL; |
||||
char *snid_escaped = NULL; |
||||
@@ -2802,6 +2803,8 @@ create_systemd_scope (GDBusConnection *session_bus, |
||||
*/ |
||||
unit_name = g_strdup_printf ("app-glib-%s-%d.scope", appid_escaped, pid); |
||||
|
||||
+ source_path = g_desktop_app_info_get_filename (info); |
||||
+ |
||||
g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ssa(sv)a(sa(sv)))")); |
||||
g_variant_builder_add (&builder, "s", unit_name); |
||||
g_variant_builder_add (&builder, "s", "fail"); |
||||
@@ -2815,6 +2818,16 @@ create_systemd_scope (GDBusConnection *session_bus, |
||||
"Description", |
||||
g_variant_new_take_string (g_strdup_printf ("Application launched by %s", |
||||
app_name))); |
||||
+ |
||||
+ /* If we have a .desktop file, document that the scope has been "generated" |
||||
+ * from it. |
||||
+ */ |
||||
+ if (source_path && g_utf8_validate (source_path, -1, NULL)) |
||||
+ g_variant_builder_add (&builder, |
||||
+ "(sv)", |
||||
+ "SourcePath", |
||||
+ g_variant_new_string (source_path)); |
||||
+ |
||||
g_variant_builder_add (&builder, |
||||
"(sv)", |
||||
"PIDs", |
||||
-- |
||||
2.31.1 |
@ -0,0 +1,222 @@
@@ -0,0 +1,222 @@
|
||||
From 1248b642ad32b0bdf296211c1a0a8817bebf1c66 Mon Sep 17 00:00:00 2001 |
||||
From: Simon McVittie <smcv@collabora.com> |
||||
Date: Thu, 25 Feb 2021 10:35:36 +0000 |
||||
Subject: [PATCH 1/2] gversionmacros: Add version macros for GLib 2.70 |
||||
|
||||
Signed-off-by: Simon McVittie <smcv@collabora.com> |
||||
--- |
||||
docs/reference/gio/gio-docs.xml | 4 +++ |
||||
docs/reference/glib/glib-docs.xml | 4 +++ |
||||
docs/reference/glib/glib-sections.txt | 14 ++++++++ |
||||
docs/reference/gobject/gobject-docs.xml | 4 +++ |
||||
docs/reference/meson.build | 2 +- |
||||
glib/gversionmacros.h | 44 +++++++++++++++++++++++++ |
||||
6 files changed, 71 insertions(+), 1 deletion(-) |
||||
|
||||
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml |
||||
index 9cd3d0e39..a09d6d31d 100644 |
||||
--- a/docs/reference/gio/gio-docs.xml |
||||
+++ b/docs/reference/gio/gio-docs.xml |
||||
@@ -389,6 +389,10 @@ |
||||
<title>Index of new symbols in 2.68</title> |
||||
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include> |
||||
</index> |
||||
+ <index id="api-index-2-70" role="2.70"> |
||||
+ <title>Index of new symbols in 2.70</title> |
||||
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include> |
||||
+ </index> |
||||
|
||||
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> |
||||
|
||||
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml |
||||
index e464fb792..2f5de9e31 100644 |
||||
--- a/docs/reference/glib/glib-docs.xml |
||||
+++ b/docs/reference/glib/glib-docs.xml |
||||
@@ -288,6 +288,10 @@ |
||||
<title>Index of new symbols in 2.68</title> |
||||
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include> |
||||
</index> |
||||
+ <index id="api-index-2-70" role="2.70"> |
||||
+ <title>Index of new symbols in 2.70</title> |
||||
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include> |
||||
+ </index> |
||||
|
||||
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> |
||||
|
||||
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt |
||||
index 460a299bf..75994e889 100644 |
||||
--- a/docs/reference/glib/glib-sections.txt |
||||
+++ b/docs/reference/glib/glib-sections.txt |
||||
@@ -138,6 +138,7 @@ GLIB_VERSION_2_62 |
||||
GLIB_VERSION_2_64 |
||||
GLIB_VERSION_2_66 |
||||
GLIB_VERSION_2_68 |
||||
+GLIB_VERSION_2_70 |
||||
GLIB_VERSION_CUR_STABLE |
||||
GLIB_VERSION_PREV_STABLE |
||||
GLIB_VERSION_MIN_REQUIRED |
||||
@@ -168,6 +169,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_62 |
||||
GLIB_AVAILABLE_ENUMERATOR_IN_2_64 |
||||
GLIB_AVAILABLE_ENUMERATOR_IN_2_66 |
||||
GLIB_AVAILABLE_ENUMERATOR_IN_2_68 |
||||
+GLIB_AVAILABLE_ENUMERATOR_IN_2_70 |
||||
GLIB_AVAILABLE_IN_ALL |
||||
GLIB_AVAILABLE_IN_2_26 |
||||
GLIB_AVAILABLE_IN_2_28 |
||||
@@ -191,6 +193,7 @@ GLIB_AVAILABLE_IN_2_62 |
||||
GLIB_AVAILABLE_IN_2_64 |
||||
GLIB_AVAILABLE_IN_2_66 |
||||
GLIB_AVAILABLE_IN_2_68 |
||||
+GLIB_AVAILABLE_IN_2_70 |
||||
GLIB_AVAILABLE_MACRO_IN_2_26 |
||||
GLIB_AVAILABLE_MACRO_IN_2_28 |
||||
GLIB_AVAILABLE_MACRO_IN_2_30 |
||||
@@ -213,12 +216,14 @@ GLIB_AVAILABLE_MACRO_IN_2_62 |
||||
GLIB_AVAILABLE_MACRO_IN_2_64 |
||||
GLIB_AVAILABLE_MACRO_IN_2_66 |
||||
GLIB_AVAILABLE_MACRO_IN_2_68 |
||||
+GLIB_AVAILABLE_MACRO_IN_2_70 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 |
||||
GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 |
||||
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 |
||||
GLIB_AVAILABLE_TYPE_IN_2_26 |
||||
GLIB_AVAILABLE_TYPE_IN_2_28 |
||||
GLIB_AVAILABLE_TYPE_IN_2_30 |
||||
@@ -241,6 +246,7 @@ GLIB_AVAILABLE_TYPE_IN_2_62 |
||||
GLIB_AVAILABLE_TYPE_IN_2_64 |
||||
GLIB_AVAILABLE_TYPE_IN_2_66 |
||||
GLIB_AVAILABLE_TYPE_IN_2_68 |
||||
+GLIB_AVAILABLE_TYPE_IN_2_70 |
||||
GLIB_DEPRECATED_ENUMERATOR |
||||
GLIB_DEPRECATED_ENUMERATOR_FOR |
||||
GLIB_DEPRECATED_ENUMERATOR_IN_2_26 |
||||
@@ -287,6 +293,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_66 |
||||
GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR |
||||
GLIB_DEPRECATED_ENUMERATOR_IN_2_68 |
||||
GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR |
||||
+GLIB_DEPRECATED_ENUMERATOR_IN_2_70 |
||||
+GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR |
||||
GLIB_DEPRECATED_IN_2_26 |
||||
GLIB_DEPRECATED_IN_2_26_FOR |
||||
GLIB_DEPRECATED_IN_2_28 |
||||
@@ -331,6 +339,8 @@ GLIB_DEPRECATED_IN_2_66 |
||||
GLIB_DEPRECATED_IN_2_66_FOR |
||||
GLIB_DEPRECATED_IN_2_68 |
||||
GLIB_DEPRECATED_IN_2_68_FOR |
||||
+GLIB_DEPRECATED_IN_2_70 |
||||
+GLIB_DEPRECATED_IN_2_70_FOR |
||||
GLIB_DEPRECATED_MACRO |
||||
GLIB_DEPRECATED_MACRO_FOR |
||||
GLIB_DEPRECATED_MACRO_IN_2_26 |
||||
@@ -377,6 +387,8 @@ GLIB_DEPRECATED_MACRO_IN_2_66 |
||||
GLIB_DEPRECATED_MACRO_IN_2_66_FOR |
||||
GLIB_DEPRECATED_MACRO_IN_2_68 |
||||
GLIB_DEPRECATED_MACRO_IN_2_68_FOR |
||||
+GLIB_DEPRECATED_MACRO_IN_2_70 |
||||
+GLIB_DEPRECATED_MACRO_IN_2_70_FOR |
||||
GLIB_DEPRECATED_TYPE |
||||
GLIB_DEPRECATED_TYPE_FOR |
||||
GLIB_DEPRECATED_TYPE_IN_2_26 |
||||
@@ -423,6 +435,8 @@ GLIB_DEPRECATED_TYPE_IN_2_66 |
||||
GLIB_DEPRECATED_TYPE_IN_2_66_FOR |
||||
GLIB_DEPRECATED_TYPE_IN_2_68 |
||||
GLIB_DEPRECATED_TYPE_IN_2_68_FOR |
||||
+GLIB_DEPRECATED_TYPE_IN_2_70 |
||||
+GLIB_DEPRECATED_TYPE_IN_2_70_FOR |
||||
GLIB_VERSION_CUR_STABLE |
||||
GLIB_VERSION_PREV_STABLE |
||||
</SECTION> |
||||
diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml |
||||
index ddbc9f274..e8e7c76d9 100644 |
||||
--- a/docs/reference/gobject/gobject-docs.xml |
||||
+++ b/docs/reference/gobject/gobject-docs.xml |
||||
@@ -208,6 +208,10 @@ |
||||
<title>Index of new symbols in 2.68</title> |
||||
<xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include> |
||||
</index> |
||||
+ <index id="api-index-2-70" role="2.70"> |
||||
+ <title>Index of new symbols in 2.70</title> |
||||
+ <xi:include href="xml/api-index-2.70.xml"><xi:fallback /></xi:include> |
||||
+ </index> |
||||
|
||||
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> |
||||
|
||||
diff --git a/docs/reference/meson.build b/docs/reference/meson.build |
||||
index 3f09be555..53ca12ff8 100644 |
||||
--- a/docs/reference/meson.build |
||||
+++ b/docs/reference/meson.build |
||||
@@ -7,7 +7,7 @@ |
||||
stable_2_series_versions = [ |
||||
'26', '28', '30', '32', '34', '36', '38', |
||||
'40', '42', '44', '46', '48', '50', '52', '54', '56', '58', |
||||
- '60', '62', '64', '66', '68', |
||||
+ '60', '62', '64', '66', '68', '70', |
||||
] |
||||
|
||||
ignore_decorators = [ |
||||
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h |
||||
index 77486eafb..d052709cf 100644 |
||||
--- a/glib/gversionmacros.h |
||||
+++ b/glib/gversionmacros.h |
||||
@@ -255,6 +255,16 @@ |
||||
*/ |
||||
#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68)) |
||||
|
||||
+/** |
||||
+ * GLIB_VERSION_2_70: |
||||
+ * |
||||
+ * A macro that evaluates to the 2.70 version of GLib, in a format |
||||
+ * that can be used by the C pre-processor. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+#define GLIB_VERSION_2_70 (G_ENCODE_VERSION (2, 70)) |
||||
+ |
||||
/** |
||||
* GLIB_VERSION_CUR_STABLE: |
||||
* |
||||
@@ -1076,4 +1086,38 @@ |
||||
# define GLIB_AVAILABLE_TYPE_IN_2_68 |
||||
#endif |
||||
|
||||
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_70 |
||||
+# define GLIB_DEPRECATED_IN_2_70 GLIB_DEPRECATED |
||||
+# define GLIB_DEPRECATED_IN_2_70_FOR(f) GLIB_DEPRECATED_FOR(f) |
||||
+# define GLIB_DEPRECATED_MACRO_IN_2_70 GLIB_DEPRECATED_MACRO |
||||
+# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) |
||||
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70 GLIB_DEPRECATED_ENUMERATOR |
||||
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) |
||||
+# define GLIB_DEPRECATED_TYPE_IN_2_70 GLIB_DEPRECATED_TYPE |
||||
+# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) |
||||
+#else |
||||
+# define GLIB_DEPRECATED_IN_2_70 _GLIB_EXTERN |
||||
+# define GLIB_DEPRECATED_IN_2_70_FOR(f) _GLIB_EXTERN |
||||
+# define GLIB_DEPRECATED_MACRO_IN_2_70 |
||||
+# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f) |
||||
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70 |
||||
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f) |
||||
+# define GLIB_DEPRECATED_TYPE_IN_2_70 |
||||
+# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f) |
||||
+#endif |
||||
+ |
||||
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_70 |
||||
+# define GLIB_AVAILABLE_IN_2_70 GLIB_UNAVAILABLE(2, 70) |
||||
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 GLIB_UNAVAILABLE_STATIC_INLINE(2, 70) |
||||
+# define GLIB_AVAILABLE_MACRO_IN_2_70 GLIB_UNAVAILABLE_MACRO(2, 70) |
||||
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70 GLIB_UNAVAILABLE_ENUMERATOR(2, 70) |
||||
+# define GLIB_AVAILABLE_TYPE_IN_2_70 GLIB_UNAVAILABLE_TYPE(2, 70) |
||||
+#else |
||||
+# define GLIB_AVAILABLE_IN_2_70 _GLIB_EXTERN |
||||
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 |
||||
+# define GLIB_AVAILABLE_MACRO_IN_2_70 |
||||
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70 |
||||
+# define GLIB_AVAILABLE_TYPE_IN_2_70 |
||||
+#endif |
||||
+ |
||||
#endif /* __G_VERSION_MACROS_H__ */ |
||||
-- |
||||
GitLab |
@ -0,0 +1,920 @@
@@ -0,0 +1,920 @@
|
||||
From 2e500304e304e45042a59855319ff0379b1978b3 Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Tue, 27 Jul 2021 17:24:17 +0200 |
||||
Subject: [PATCH 1/4] tests: Remove unused constant in GMemoryMonitor test |
||||
|
||||
--- |
||||
gio/tests/memory-monitor-dbus.py.in | 3 --- |
||||
1 file changed, 3 deletions(-) |
||||
|
||||
diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in |
||||
index cd16cf4e3..7823e7309 100755 |
||||
--- a/gio/tests/memory-monitor-dbus.py.in |
||||
+++ b/gio/tests/memory-monitor-dbus.py.in |
||||
@@ -31,9 +31,6 @@ try: |
||||
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) |
||||
|
||||
- # XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal") |
||||
- XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal" |
||||
- |
||||
class TestLowMemoryMonitor(dbusmock.DBusTestCase): |
||||
'''Test GMemoryMonitorDBus''' |
||||
|
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From a7000cd989438b01e599b2cfa8b6d5a360bfd102 Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Wed, 28 Jul 2021 15:10:16 +0200 |
||||
Subject: [PATCH 2/4] gio: g_clear_signal_handler() can handle NULL args |
||||
|
||||
--- |
||||
gio/gmemorymonitordbus.c | 6 ++---- |
||||
1 file changed, 2 insertions(+), 4 deletions(-) |
||||
|
||||
diff --git a/gio/gmemorymonitordbus.c b/gio/gmemorymonitordbus.c |
||||
index a34a58d3b..08dc53df1 100644 |
||||
--- a/gio/gmemorymonitordbus.c |
||||
+++ b/gio/gmemorymonitordbus.c |
||||
@@ -115,8 +115,7 @@ lmm_vanished_cb (GDBusConnection *connection, |
||||
{ |
||||
GMemoryMonitorDBus *dbus = user_data; |
||||
|
||||
- if (dbus->proxy != NULL) |
||||
- g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
+ g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
g_clear_object (&dbus->proxy); |
||||
} |
||||
|
||||
@@ -143,8 +142,7 @@ g_memory_monitor_dbus_finalize (GObject *object) |
||||
{ |
||||
GMemoryMonitorDBus *dbus = G_MEMORY_MONITOR_DBUS (object); |
||||
|
||||
- if (dbus->proxy != NULL) |
||||
- g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
+ g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
g_clear_object (&dbus->proxy); |
||||
g_clear_handle_id (&dbus->watch_id, g_bus_unwatch_name); |
||||
|
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 92399e7114e590f0371b1a5d71f478f840cb4074 Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Wed, 28 Jul 2021 15:30:15 +0200 |
||||
Subject: [PATCH 3/4] gio: Do not block when low-memory-monitor daemon appears |
||||
|
||||
--- |
||||
gio/gmemorymonitordbus.c | 42 +++++++++++++++++++++++++++------------- |
||||
1 file changed, 29 insertions(+), 13 deletions(-) |
||||
|
||||
diff --git a/gio/gmemorymonitordbus.c b/gio/gmemorymonitordbus.c |
||||
index 08dc53df1..739b83214 100644 |
||||
--- a/gio/gmemorymonitordbus.c |
||||
+++ b/gio/gmemorymonitordbus.c |
||||
@@ -25,6 +25,7 @@ |
||||
#include "giomodule-priv.h" |
||||
#include "glibintl.h" |
||||
#include "glib/gstdio.h" |
||||
+#include "gcancellable.h" |
||||
#include "gdbusproxy.h" |
||||
#include "gdbusnamewatching.h" |
||||
|
||||
@@ -38,6 +39,7 @@ struct _GMemoryMonitorDBus |
||||
GObject parent_instance; |
||||
|
||||
guint watch_id; |
||||
+ GCancellable *cancellable; |
||||
GDBusProxy *proxy; |
||||
gulong signal_id; |
||||
}; |
||||
@@ -77,24 +79,15 @@ proxy_signal_cb (GDBusProxy *proxy, |
||||
} |
||||
|
||||
static void |
||||
-lmm_appeared_cb (GDBusConnection *connection, |
||||
- const gchar *name, |
||||
- const gchar *name_owner, |
||||
- gpointer user_data) |
||||
+lmm_proxy_cb (GObject *source_object, |
||||
+ GAsyncResult *res, |
||||
+ gpointer user_data) |
||||
{ |
||||
GMemoryMonitorDBus *dbus = user_data; |
||||
GDBusProxy *proxy; |
||||
GError *error = NULL; |
||||
|
||||
- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, |
||||
- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, |
||||
- NULL, |
||||
- "org.freedesktop.LowMemoryMonitor", |
||||
- "/org/freedesktop/LowMemoryMonitor", |
||||
- "org.freedesktop.LowMemoryMonitor", |
||||
- NULL, |
||||
- &error); |
||||
- |
||||
+ proxy = g_dbus_proxy_new_finish (res, &error); |
||||
if (!proxy) |
||||
{ |
||||
g_debug ("Failed to create LowMemoryMonitor D-Bus proxy: %s", |
||||
@@ -106,6 +99,26 @@ lmm_appeared_cb (GDBusConnection *connection, |
||||
dbus->signal_id = g_signal_connect (G_OBJECT (proxy), "g-signal", |
||||
G_CALLBACK (proxy_signal_cb), dbus); |
||||
dbus->proxy = proxy; |
||||
+ |
||||
+} |
||||
+ |
||||
+static void |
||||
+lmm_appeared_cb (GDBusConnection *connection, |
||||
+ const gchar *name, |
||||
+ const gchar *name_owner, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GMemoryMonitorDBus *dbus = user_data; |
||||
+ |
||||
+ g_dbus_proxy_new (connection, |
||||
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, |
||||
+ NULL, |
||||
+ "org.freedesktop.LowMemoryMonitor", |
||||
+ "/org/freedesktop/LowMemoryMonitor", |
||||
+ "org.freedesktop.LowMemoryMonitor", |
||||
+ dbus->cancellable, |
||||
+ lmm_proxy_cb, |
||||
+ dbus); |
||||
} |
||||
|
||||
static void |
||||
@@ -126,6 +139,7 @@ g_memory_monitor_dbus_initable_init (GInitable *initable, |
||||
{ |
||||
GMemoryMonitorDBus *dbus = G_MEMORY_MONITOR_DBUS (initable); |
||||
|
||||
+ dbus->cancellable = g_cancellable_new (); |
||||
dbus->watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, |
||||
"org.freedesktop.LowMemoryMonitor", |
||||
G_BUS_NAME_WATCHER_FLAGS_AUTO_START, |
||||
@@ -142,6 +156,8 @@ g_memory_monitor_dbus_finalize (GObject *object) |
||||
{ |
||||
GMemoryMonitorDBus *dbus = G_MEMORY_MONITOR_DBUS (object); |
||||
|
||||
+ g_cancellable_cancel (dbus->cancellable); |
||||
+ g_clear_object (&dbus->cancellable); |
||||
g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
g_clear_object (&dbus->proxy); |
||||
g_clear_handle_id (&dbus->watch_id, g_bus_unwatch_name); |
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 889bdb994fed44344a84ad01aa5633a1b1b62b19 Mon Sep 17 00:00:00 2001 |
||||
From: Patrick Griffis <pgriffis@igalia.com> |
||||
Date: Tue, 20 Jul 2021 16:04:31 -0500 |
||||
Subject: [PATCH 4/4] Add GPowerProfileMonitor |
||||
|
||||
--- |
||||
docs/reference/gio/gio-docs.xml | 1 + |
||||
docs/reference/gio/gio-sections-common.txt | 18 ++ |
||||
docs/reference/gio/meson.build | 1 + |
||||
gio/gio.h | 1 + |
||||
gio/giomodule.c | 7 + |
||||
gio/gpowerprofilemonitor.c | 141 ++++++++++++ |
||||
gio/gpowerprofilemonitor.h | 63 ++++++ |
||||
gio/gpowerprofilemonitordbus.c | 240 +++++++++++++++++++++ |
||||
gio/gpowerprofilemonitordbus.h | 32 +++ |
||||
gio/meson.build | 3 + |
||||
gio/tests/meson.build | 1 + |
||||
gio/tests/power-profile-monitor.c | 79 +++++++ |
||||
12 files changed, 587 insertions(+) |
||||
create mode 100644 gio/gpowerprofilemonitor.c |
||||
create mode 100644 gio/gpowerprofilemonitor.h |
||||
create mode 100644 gio/gpowerprofilemonitordbus.c |
||||
create mode 100644 gio/gpowerprofilemonitordbus.h |
||||
create mode 100644 gio/tests/power-profile-monitor.c |
||||
|
||||
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml |
||||
index a09d6d31d..b01133900 100644 |
||||
--- a/docs/reference/gio/gio-docs.xml |
||||
+++ b/docs/reference/gio/gio-docs.xml |
||||
@@ -238,6 +238,7 @@ |
||||
<xi:include href="xml/gmenuexporter.xml"/> |
||||
<xi:include href="xml/gdbusmenumodel.xml"/> |
||||
<xi:include href="xml/gnotification.xml"/> |
||||
+ <xi:include href="xml/gpowerprofilemonitor.xml"/> |
||||
</chapter> |
||||
<chapter id="extending"> |
||||
<title>Extending GIO</title> |
||||
diff --git a/docs/reference/gio/gio-sections-common.txt b/docs/reference/gio/gio-sections-common.txt |
||||
index 250491a42..a7addedc2 100644 |
||||
--- a/docs/reference/gio/gio-sections-common.txt |
||||
+++ b/docs/reference/gio/gio-sections-common.txt |
||||
@@ -4247,6 +4247,24 @@ G_NETWORK_MONITOR_GET_INTERFACE |
||||
g_network_connectivity_get_type |
||||
</SECTION> |
||||
|
||||
+<SECTION> |
||||
+<FILE>gpowerprofilemonitor</FILE> |
||||
+<TITLE>GPowerProfileMonitor</TITLE> |
||||
+GPowerProfileMonitor |
||||
+GPowerProfileMonitorInterface |
||||
+G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME |
||||
+g_power_profile_monitor_dup_default |
||||
+g_power_profile_monitor_get_power_saver_enabled |
||||
+<SUBSECTION Standard> |
||||
+g_power_profile_monitor_get_type |
||||
+G_TYPE_POWER_PROFILE_MONITOR |
||||
+G_POWER_PROFILE_MONITOR |
||||
+G_IS_POWER_PROFILE_MONITOR |
||||
+G_POWER_PROFILE_MONITOR_GET_INTERFACE |
||||
+G_TYPE_POWER_PROFILE_LEVEL |
||||
+g_power_profile_level_get_type |
||||
+</SECTION> |
||||
+ |
||||
<SECTION> |
||||
<FILE>gmenuexporter</FILE> |
||||
g_dbus_connection_export_menu_model |
||||
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build |
||||
index 4d0364819..fbabd25ca 100644 |
||||
--- a/docs/reference/gio/meson.build |
||||
+++ b/docs/reference/gio/meson.build |
||||
@@ -65,6 +65,7 @@ if get_option('gtk_doc') |
||||
'gopenuriportal.h', |
||||
'gpollfilemonitor.h', |
||||
'gportalsupport.h', |
||||
+ 'gpowerprofilemonitordbus.h', |
||||
'gproxyresolverportal.h', |
||||
'gregistrysettingsbackend.h', |
||||
'gresourcefile.h', |
||||
diff --git a/gio/gio.h b/gio/gio.h |
||||
index f5d2dd5a3..e9afab666 100644 |
||||
--- a/gio/gio.h |
||||
+++ b/gio/gio.h |
||||
@@ -120,6 +120,7 @@ |
||||
#include <gio/gpollableinputstream.h> |
||||
#include <gio/gpollableoutputstream.h> |
||||
#include <gio/gpollableutils.h> |
||||
+#include <gio/gpowerprofilemonitor.h> |
||||
#include <gio/gpropertyaction.h> |
||||
#include <gio/gproxy.h> |
||||
#include <gio/gproxyaddress.h> |
||||
diff --git a/gio/giomodule.c b/gio/giomodule.c |
||||
index c1d451b5c..dfd895717 100644 |
||||
--- a/gio/giomodule.c |
||||
+++ b/gio/giomodule.c |
||||
@@ -48,6 +48,8 @@ |
||||
#include "gmemorymonitor.h" |
||||
#include "gmemorymonitorportal.h" |
||||
#include "gmemorymonitordbus.h" |
||||
+#include "gpowerprofilemonitor.h" |
||||
+#include "gpowerprofilemonitordbus.h" |
||||
#ifdef G_OS_WIN32 |
||||
#include "gregistrysettingsbackend.h" |
||||
#include "giowin32-priv.h" |
||||
@@ -1077,6 +1079,7 @@ extern GType _g_network_monitor_nm_get_type (void); |
||||
|
||||
extern GType g_memory_monitor_dbus_get_type (void); |
||||
extern GType g_memory_monitor_portal_get_type (void); |
||||
+extern GType g_power_profile_monitor_dbus_get_type (void); |
||||
|
||||
#ifdef G_OS_UNIX |
||||
extern GType g_fdo_notification_backend_get_type (void); |
||||
@@ -1187,6 +1190,9 @@ _g_io_modules_ensure_extension_points_registered (void) |
||||
|
||||
ep = g_io_extension_point_register (G_MEMORY_MONITOR_EXTENSION_POINT_NAME); |
||||
g_io_extension_point_set_required_type (ep, G_TYPE_MEMORY_MONITOR); |
||||
+ |
||||
+ ep = g_io_extension_point_register (G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME); |
||||
+ g_io_extension_point_set_required_type (ep, G_TYPE_POWER_PROFILE_MONITOR); |
||||
} |
||||
|
||||
G_UNLOCK (registered_extensions); |
||||
@@ -1272,6 +1278,7 @@ _g_io_modules_ensure_loaded (void) |
||||
g_type_ensure (g_null_settings_backend_get_type ()); |
||||
g_type_ensure (g_memory_settings_backend_get_type ()); |
||||
g_type_ensure (g_keyfile_settings_backend_get_type ()); |
||||
+ g_type_ensure (g_power_profile_monitor_dbus_get_type ()); |
||||
#if defined(HAVE_INOTIFY_INIT1) |
||||
g_type_ensure (g_inotify_file_monitor_get_type ()); |
||||
#endif |
||||
diff --git a/gio/gpowerprofilemonitor.c b/gio/gpowerprofilemonitor.c |
||||
new file mode 100644 |
||||
index 000000000..f5028b3e8 |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitor.c |
||||
@@ -0,0 +1,141 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2019 Red Hat, Inc |
||||
+ * Copyright 2021 Igalia S.L. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#include "config.h" |
||||
+#include "glib.h" |
||||
+#include "glibintl.h" |
||||
+ |
||||
+#include "gpowerprofilemonitor.h" |
||||
+#include "ginetaddress.h" |
||||
+#include "ginetsocketaddress.h" |
||||
+#include "ginitable.h" |
||||
+#include "gioenumtypes.h" |
||||
+#include "giomodule-priv.h" |
||||
+#include "gtask.h" |
||||
+ |
||||
+/** |
||||
+ * SECTION:gpowerprofilemonitor |
||||
+ * @title: GPowerProfileMonitor |
||||
+ * @short_description: Power profile monitor |
||||
+ * @include: gio/gio.h |
||||
+ * |
||||
+ * #GPowerProfileMonitor makes it possible for applications as well as OS components |
||||
+ * to monitor system power profiles and act upon them. It currently only exports |
||||
+ * whether the system is in “Power Saver” mode (known as “Low Power” mode on |
||||
+ * some systems). |
||||
+ * |
||||
+ * When in “Low Power” mode, it is recommended that applications: |
||||
+ * - disabling automatic downloads |
||||
+ * - reduce the rate of refresh from online sources such as calendar or |
||||
+ * email synchronisation |
||||
+ * - if the application has expensive visual effects, reduce them |
||||
+ * |
||||
+ * It is also likely that OS components providing services to applications will |
||||
+ * lower their own background activity, for the sake of the system. |
||||
+ * |
||||
+ * There are a variety of tools that exist for power consumption analysis, but those |
||||
+ * usually depend on the OS and hardware used. On Linux, one could use `upower` to |
||||
+ * monitor the battery discharge rate, `powertop` to check on the background activity |
||||
+ * or activity at all), `sysprof` to inspect CPU usage, and `intel_gpu_time` to |
||||
+ * profile GPU usage. |
||||
+ * |
||||
+ * Don't forget to disconnect the #GPowerProfileMonitor::notify::power-saver-enabled |
||||
+ * signal, and unref the #GPowerProfileMonitor itself when exiting. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+ |
||||
+/** |
||||
+ * GPowerProfileMonitor: |
||||
+ * |
||||
+ * #GPowerProfileMonitor monitors system power profile and notifies on |
||||
+ * changes. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+ |
||||
+/** |
||||
+ * GPowerProfileMonitorInterface: |
||||
+ * @g_iface: The parent interface. |
||||
+ * |
||||
+ * The virtual function table for #GPowerProfileMonitor. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+ |
||||
+G_DEFINE_INTERFACE_WITH_CODE (GPowerProfileMonitor, g_power_profile_monitor, G_TYPE_OBJECT, |
||||
+ g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_INITABLE)) |
||||
+ |
||||
+ |
||||
+/** |
||||
+ * g_power_profile_monitor_dup_default: |
||||
+ * |
||||
+ * Gets a reference to the default #GPowerProfileMonitor for the system. |
||||
+ * |
||||
+ * Returns: (not nullable) (transfer full): a new reference to the default #GPowerProfileMonitor |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+GPowerProfileMonitor * |
||||
+g_power_profile_monitor_dup_default (void) |
||||
+{ |
||||
+ return g_object_ref (_g_io_module_get_default (G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME, |
||||
+ "GIO_USE_POWER_PROFILE_MONITOR", |
||||
+ NULL)); |
||||
+} |
||||
+ |
||||
+/** |
||||
+ * g_power_profile_monitor_get_power_saver_enabled: |
||||
+ * @monitor: a #GPowerProfileMonitor |
||||
+ * |
||||
+ * Gets whether the system is in “Power Saver” mode. |
||||
+ * |
||||
+ * You are expected to listen to the |
||||
+ * #GPowerProfileMonitor::notify::power-saver-enabled signal to know when the profile has |
||||
+ * changed. |
||||
+ * |
||||
+ * Returns: Whether the system is in “Power Saver” mode. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+gboolean |
||||
+g_power_profile_monitor_get_power_saver_enabled (GPowerProfileMonitor *monitor) |
||||
+{ |
||||
+ gboolean enabled; |
||||
+ g_object_get (monitor, "power-saver-enabled", &enabled, NULL); |
||||
+ return enabled; |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_default_init (GPowerProfileMonitorInterface *iface) |
||||
+{ |
||||
+ /** |
||||
+ * GPowerProfileMonitor:power-saver-enabled: |
||||
+ * |
||||
+ * Whether “Power Saver” mode is enabled on the system. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+ g_object_interface_install_property (iface, |
||||
+ g_param_spec_boolean ("power-saver-enabled", |
||||
+ "power-saver-enabled", |
||||
+ "Power Saver Enabled", |
||||
+ FALSE, |
||||
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY)); |
||||
+} |
||||
diff --git a/gio/gpowerprofilemonitor.h b/gio/gpowerprofilemonitor.h |
||||
new file mode 100644 |
||||
index 000000000..0891fc3dc |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitor.h |
||||
@@ -0,0 +1,63 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2019 Red Hat, Inc. |
||||
+ * Copyright 2021 Igalia S.L. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#ifndef __G_POWER_PROFILE_MONITOR_H__ |
||||
+#define __G_POWER_PROFILE_MONITOR_H__ |
||||
+ |
||||
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) |
||||
+#error "Only <gio/gio.h> can be included directly." |
||||
+#endif |
||||
+ |
||||
+#include <gio/giotypes.h> |
||||
+ |
||||
+G_BEGIN_DECLS |
||||
+ |
||||
+/** |
||||
+ * G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME: |
||||
+ * |
||||
+ * Extension point for power profile usage monitoring functionality. |
||||
+ * See [Extending GIO][extending-gio]. |
||||
+ * |
||||
+ * Since: 2.70 |
||||
+ */ |
||||
+#define G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME "gio-power-profile-monitor" |
||||
+ |
||||
+#define G_TYPE_POWER_PROFILE_MONITOR (g_power_profile_monitor_get_type ()) |
||||
+GLIB_AVAILABLE_IN_2_70 |
||||
+G_DECLARE_INTERFACE (GPowerProfileMonitor, g_power_profile_monitor, g, power_profile_monitor, GObject) |
||||
+ |
||||
+#define G_POWER_PROFILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_POWER_PROFILE_MONITOR, GPowerProfileMonitor)) |
||||
+#define G_IS_POWER_PROFILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_POWER_PROFILE_MONITOR)) |
||||
+#define G_POWER_PROFILE_MONITOR_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_POWER_PROFILE_MONITOR, GPowerProfileMonitorInterface)) |
||||
+ |
||||
+struct _GPowerProfileMonitorInterface |
||||
+{ |
||||
+ /*< private >*/ |
||||
+ GTypeInterface g_iface; |
||||
+}; |
||||
+ |
||||
+GLIB_AVAILABLE_IN_2_70 |
||||
+GPowerProfileMonitor *g_power_profile_monitor_dup_default (void); |
||||
+ |
||||
+GLIB_AVAILABLE_IN_2_70 |
||||
+gboolean g_power_profile_monitor_get_power_saver_enabled (GPowerProfileMonitor *monitor); |
||||
+ |
||||
+G_END_DECLS |
||||
+ |
||||
+#endif /* __G_POWER_PROFILE_MONITOR_H__ */ |
||||
diff --git a/gio/gpowerprofilemonitordbus.c b/gio/gpowerprofilemonitordbus.c |
||||
new file mode 100644 |
||||
index 000000000..8bbfe3acc |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitordbus.c |
||||
@@ -0,0 +1,240 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2019 Red Hat, Inc. |
||||
+ * Copyrgith 2021 Igalia S.L. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#include "config.h" |
||||
+ |
||||
+#include "gpowerprofilemonitor.h" |
||||
+#include "gpowerprofilemonitordbus.h" |
||||
+#include "gioerror.h" |
||||
+#include "ginitable.h" |
||||
+#include "giomodule-priv.h" |
||||
+#include "glibintl.h" |
||||
+#include "glib/gstdio.h" |
||||
+#include "gcancellable.h" |
||||
+#include "gdbusproxy.h" |
||||
+#include "gdbusnamewatching.h" |
||||
+ |
||||
+#define G_POWER_PROFILE_MONITOR_DBUS_GET_INITABLE_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_INITABLE, GInitable)) |
||||
+ |
||||
+static void g_power_profile_monitor_dbus_iface_init (GPowerProfileMonitorInterface *iface); |
||||
+static void g_power_profile_monitor_dbus_initable_iface_init (GInitableIface *iface); |
||||
+ |
||||
+struct _GPowerProfileMonitorDBus |
||||
+{ |
||||
+ GObject parent_instance; |
||||
+ |
||||
+ guint watch_id; |
||||
+ GCancellable *cancellable; |
||||
+ GDBusProxy *proxy; |
||||
+ gulong signal_id; |
||||
+ |
||||
+ gboolean power_saver_enabled; |
||||
+}; |
||||
+ |
||||
+typedef enum |
||||
+{ |
||||
+ PROP_POWER_SAVER_ENABLED = 1, |
||||
+} GPowerProfileMonitorDBusProperty; |
||||
+ |
||||
+#define POWERPROFILES_DBUS_NAME "net.hadess.PowerProfiles" |
||||
+#define POWERPROFILES_DBUS_IFACE "net.hadess.PowerProfiles" |
||||
+#define POWERPROFILES_DBUS_PATH "/net/hadess/PowerProfiles" |
||||
+ |
||||
+G_DEFINE_TYPE_WITH_CODE (GPowerProfileMonitorDBus, g_power_profile_monitor_dbus, G_TYPE_OBJECT, |
||||
+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, |
||||
+ g_power_profile_monitor_dbus_initable_iface_init) |
||||
+ G_IMPLEMENT_INTERFACE (G_TYPE_POWER_PROFILE_MONITOR, |
||||
+ g_power_profile_monitor_dbus_iface_init) |
||||
+ _g_io_modules_ensure_extension_points_registered (); |
||||
+ g_io_extension_point_implement (G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME, |
||||
+ g_define_type_id, |
||||
+ "dbus", |
||||
+ 30)) |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_init (GPowerProfileMonitorDBus *dbus) |
||||
+{ |
||||
+ dbus->power_saver_enabled = FALSE; |
||||
+} |
||||
+ |
||||
+static void |
||||
+ppd_properties_changed_cb (GDBusProxy *proxy, |
||||
+ GVariant *changed_properties, |
||||
+ GStrv *invalidated_properties, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = user_data; |
||||
+ const char *active_profile; |
||||
+ gboolean enabled; |
||||
+ |
||||
+ if (!g_variant_lookup (changed_properties, "ActiveProfile", "&s", &active_profile)) |
||||
+ return; |
||||
+ |
||||
+ enabled = g_strcmp0 (active_profile, "power-saver") == 0; |
||||
+ if (enabled == dbus->power_saver_enabled) |
||||
+ return; |
||||
+ |
||||
+ dbus->power_saver_enabled = enabled; |
||||
+ g_object_notify (G_OBJECT (dbus), "power-saver-enabled"); |
||||
+} |
||||
+ |
||||
+static void |
||||
+ppd_proxy_cb (GObject *source_object, |
||||
+ GAsyncResult *res, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = user_data; |
||||
+ GVariant *active_profile_variant; |
||||
+ GDBusProxy *proxy; |
||||
+ GError *error = NULL; |
||||
+ const char *active_profile; |
||||
+ gboolean power_saver_enabled; |
||||
+ |
||||
+ proxy = g_dbus_proxy_new_finish (res, &error); |
||||
+ if (!proxy) |
||||
+ { |
||||
+ g_debug ("GPowerProfileMonitorDBus: Failed to create PowerProfiles D-Bus proxy: %s", |
||||
+ error->message); |
||||
+ g_error_free (error); |
||||
+ return; |
||||
+ } |
||||
+ |
||||
+ active_profile_variant = g_dbus_proxy_get_cached_property (proxy, "ActiveProfile"); |
||||
+ if (g_variant_is_of_type (active_profile_variant, G_VARIANT_TYPE_STRING)) |
||||
+ { |
||||
+ active_profile = g_variant_get_string (active_profile_variant, NULL); |
||||
+ power_saver_enabled = g_strcmp0 (active_profile, "power-saver") == 0; |
||||
+ if (power_saver_enabled != dbus->power_saver_enabled) |
||||
+ { |
||||
+ dbus->power_saver_enabled = power_saver_enabled; |
||||
+ g_object_notify (G_OBJECT (dbus), "power-saver-enabled"); |
||||
+ } |
||||
+ } |
||||
+ |
||||
+ dbus->signal_id = g_signal_connect (G_OBJECT (proxy), "g-properties-changed", |
||||
+ G_CALLBACK (ppd_properties_changed_cb), dbus); |
||||
+ dbus->proxy = g_steal_pointer (&proxy); |
||||
+} |
||||
+ |
||||
+static void |
||||
+ppd_appeared_cb (GDBusConnection *connection, |
||||
+ const gchar *name, |
||||
+ const gchar *name_owner, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = user_data; |
||||
+ |
||||
+ g_dbus_proxy_new (connection, |
||||
+ G_DBUS_PROXY_FLAGS_NONE, |
||||
+ NULL, |
||||
+ POWERPROFILES_DBUS_NAME, |
||||
+ POWERPROFILES_DBUS_PATH, |
||||
+ POWERPROFILES_DBUS_IFACE, |
||||
+ dbus->cancellable, |
||||
+ ppd_proxy_cb, |
||||
+ dbus); |
||||
+} |
||||
+ |
||||
+static void |
||||
+ppd_vanished_cb (GDBusConnection *connection, |
||||
+ const gchar *name, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = user_data; |
||||
+ |
||||
+ g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
+ g_clear_object (&dbus->proxy); |
||||
+ |
||||
+ dbus->power_saver_enabled = FALSE; |
||||
+ g_object_notify (G_OBJECT (dbus), "power-saver-enabled"); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_get_property (GObject *object, |
||||
+ guint prop_id, |
||||
+ GValue *value, |
||||
+ GParamSpec *pspec) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = G_POWER_PROFILE_MONITOR_DBUS (object); |
||||
+ |
||||
+ switch ((GPowerProfileMonitorDBusProperty) prop_id) |
||||
+ { |
||||
+ case PROP_POWER_SAVER_ENABLED: |
||||
+ g_value_set_boolean (value, dbus->power_saver_enabled); |
||||
+ break; |
||||
+ |
||||
+ default: |
||||
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
||||
+ } |
||||
+} |
||||
+ |
||||
+static gboolean |
||||
+g_power_profile_monitor_dbus_initable_init (GInitable *initable, |
||||
+ GCancellable *cancellable, |
||||
+ GError **error) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = G_POWER_PROFILE_MONITOR_DBUS (initable); |
||||
+ |
||||
+ dbus->cancellable = g_cancellable_new (); |
||||
+ dbus->watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, |
||||
+ POWERPROFILES_DBUS_NAME, |
||||
+ G_BUS_NAME_WATCHER_FLAGS_AUTO_START, |
||||
+ ppd_appeared_cb, |
||||
+ ppd_vanished_cb, |
||||
+ dbus, |
||||
+ NULL); |
||||
+ |
||||
+ return TRUE; |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_finalize (GObject *object) |
||||
+{ |
||||
+ GPowerProfileMonitorDBus *dbus = G_POWER_PROFILE_MONITOR_DBUS (object); |
||||
+ |
||||
+ g_cancellable_cancel (dbus->cancellable); |
||||
+ g_clear_object (&dbus->cancellable); |
||||
+ g_clear_signal_handler (&dbus->signal_id, dbus->proxy); |
||||
+ g_clear_object (&dbus->proxy); |
||||
+ g_clear_handle_id (&dbus->watch_id, g_bus_unwatch_name); |
||||
+ |
||||
+ G_OBJECT_CLASS (g_power_profile_monitor_dbus_parent_class)->finalize (object); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_class_init (GPowerProfileMonitorDBusClass *nl_class) |
||||
+{ |
||||
+ GObjectClass *gobject_class = G_OBJECT_CLASS (nl_class); |
||||
+ |
||||
+ gobject_class->get_property = g_power_profile_monitor_dbus_get_property; |
||||
+ gobject_class->finalize = g_power_profile_monitor_dbus_finalize; |
||||
+ |
||||
+ g_object_class_override_property (gobject_class, PROP_POWER_SAVER_ENABLED, "power-saver-enabled"); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_iface_init (GPowerProfileMonitorInterface *monitor_iface) |
||||
+{ |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_dbus_initable_iface_init (GInitableIface *iface) |
||||
+{ |
||||
+ iface->init = g_power_profile_monitor_dbus_initable_init; |
||||
+} |
||||
diff --git a/gio/gpowerprofilemonitordbus.h b/gio/gpowerprofilemonitordbus.h |
||||
new file mode 100644 |
||||
index 000000000..ecf7246d1 |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitordbus.h |
||||
@@ -0,0 +1,32 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2019 Red Hat, Inc. |
||||
+ * Copyright 2021 Igalia S.L. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#ifndef __G_POWER_PROFILE_MONITOR_DBUS_H__ |
||||
+#define __G_POWER_PROFILE_MONITOR_DBUS_H__ |
||||
+ |
||||
+#include <glib-object.h> |
||||
+ |
||||
+G_BEGIN_DECLS |
||||
+ |
||||
+#define G_TYPE_POWER_PROFILE_MONITOR_DBUS (g_power_profile_monitor_dbus_get_type ()) |
||||
+G_DECLARE_FINAL_TYPE (GPowerProfileMonitorDBus, g_power_profile_monitor_dbus, G, POWER_PROFILE_MONITOR_DBUS, GObject) |
||||
+ |
||||
+G_END_DECLS |
||||
+ |
||||
+#endif /* __G_POWER_PROFILE_MONITOR_DBUS_H__ */ |
||||
diff --git a/gio/meson.build b/gio/meson.build |
||||
index 49a37a7bd..d5838ed8a 100644 |
||||
--- a/gio/meson.build |
||||
+++ b/gio/meson.build |
||||
@@ -533,6 +533,8 @@ gio_sources = files( |
||||
'gpollableoutputstream.c', |
||||
'gpollableutils.c', |
||||
'gpollfilemonitor.c', |
||||
+ 'gpowerprofilemonitor.c', |
||||
+ 'gpowerprofilemonitordbus.c', |
||||
'gproxy.c', |
||||
'gproxyaddress.c', |
||||
'gproxyaddressenumerator.c', |
||||
@@ -673,6 +675,7 @@ gio_headers = files( |
||||
'gpollableinputstream.h', |
||||
'gpollableoutputstream.h', |
||||
'gpollableutils.h', |
||||
+ 'gpowerprofilemonitor.h', |
||||
'gproxy.h', |
||||
'gproxyaddress.h', |
||||
'gproxyaddressenumerator.h', |
||||
diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
||||
index 98d1401d0..fc2055101 100644 |
||||
--- a/gio/tests/meson.build |
||||
+++ b/gio/tests/meson.build |
||||
@@ -75,6 +75,7 @@ gio_tests = { |
||||
'network-monitor-race' : {}, |
||||
'permission' : {}, |
||||
'pollable' : {'dependencies' : [libdl_dep]}, |
||||
+ 'power-profile-monitor' : {}, |
||||
'proxy-test' : {}, |
||||
'readwrite' : {}, |
||||
'simple-async-result' : {}, |
||||
diff --git a/gio/tests/power-profile-monitor.c b/gio/tests/power-profile-monitor.c |
||||
new file mode 100644 |
||||
index 000000000..bb32f181f |
||||
--- /dev/null |
||||
+++ b/gio/tests/power-profile-monitor.c |
||||
@@ -0,0 +1,79 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2021 Igalia S.L. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#include <gio/gio.h> |
||||
+ |
||||
+static void |
||||
+test_dup_default (void) |
||||
+{ |
||||
+ GPowerProfileMonitor *monitor; |
||||
+ |
||||
+ monitor = g_power_profile_monitor_dup_default (); |
||||
+ g_assert_nonnull (monitor); |
||||
+ g_object_unref (monitor); |
||||
+} |
||||
+ |
||||
+static void |
||||
+power_saver_enabled_cb (GPowerProfileMonitor *monitor, |
||||
+ GParamSpec *pspec, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ gboolean enabled; |
||||
+ |
||||
+ enabled = g_power_profile_monitor_get_power_saver_enabled (monitor); |
||||
+ g_debug ("Power Saver %s (%d)", enabled ? "enabled" : "disabled", enabled); |
||||
+} |
||||
+ |
||||
+static void |
||||
+do_watch_power_profile (void) |
||||
+{ |
||||
+ GPowerProfileMonitor *monitor; |
||||
+ GMainLoop *loop; |
||||
+ gulong signal_id; |
||||
+ |
||||
+ monitor = g_power_profile_monitor_dup_default (); |
||||
+ signal_id = g_signal_connect (G_OBJECT (monitor), "notify::power-saver-enabled", |
||||
+ G_CALLBACK (power_saver_enabled_cb), NULL); |
||||
+ |
||||
+ loop = g_main_loop_new (NULL, TRUE); |
||||
+ g_main_loop_run (loop); |
||||
+ |
||||
+ g_signal_handler_disconnect (monitor, signal_id); |
||||
+ g_object_unref (monitor); |
||||
+ g_main_loop_unref (loop); |
||||
+} |
||||
+ |
||||
+int |
||||
+main (int argc, char **argv) |
||||
+{ |
||||
+ int ret; |
||||
+ |
||||
+ if (argc == 2 && !strcmp (argv[1], "--watch")) |
||||
+ { |
||||
+ do_watch_power_profile (); |
||||
+ return 0; |
||||
+ } |
||||
+ |
||||
+ g_test_init (&argc, &argv, NULL); |
||||
+ |
||||
+ g_test_add_func ("/power-profile-monitor/default", test_dup_default); |
||||
+ |
||||
+ ret = g_test_run (); |
||||
+ |
||||
+ return ret; |
||||
+} |
||||
-- |
||||
GitLab |
||||
|
@ -0,0 +1,739 @@
@@ -0,0 +1,739 @@
|
||||
From 9645cbffa8ba1a08b73fdae50b31125d11aa5684 Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Mon, 9 Aug 2021 23:19:17 +0200 |
||||
Subject: [PATCH 1/4] gio: Add portal version of GPowerProfileMonitor |
||||
|
||||
--- |
||||
docs/reference/gio/meson.build | 1 + |
||||
gio/giomodule.c | 2 + |
||||
gio/gpowerprofilemonitorportal.c | 182 +++++++++++++++++++++++++++++++ |
||||
gio/gpowerprofilemonitorportal.h | 31 ++++++ |
||||
gio/meson.build | 1 + |
||||
5 files changed, 217 insertions(+) |
||||
create mode 100644 gio/gpowerprofilemonitorportal.c |
||||
create mode 100644 gio/gpowerprofilemonitorportal.h |
||||
|
||||
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build |
||||
index fbabd25ca..9aaafeed5 100644 |
||||
--- a/docs/reference/gio/meson.build |
||||
+++ b/docs/reference/gio/meson.build |
||||
@@ -66,6 +66,7 @@ if get_option('gtk_doc') |
||||
'gpollfilemonitor.h', |
||||
'gportalsupport.h', |
||||
'gpowerprofilemonitordbus.h', |
||||
+ 'gpowerprofilemonitorportal.h', |
||||
'gproxyresolverportal.h', |
||||
'gregistrysettingsbackend.h', |
||||
'gresourcefile.h', |
||||
diff --git a/gio/giomodule.c b/gio/giomodule.c |
||||
index dfd895717..d34037a45 100644 |
||||
--- a/gio/giomodule.c |
||||
+++ b/gio/giomodule.c |
||||
@@ -50,6 +50,7 @@ |
||||
#include "gmemorymonitordbus.h" |
||||
#include "gpowerprofilemonitor.h" |
||||
#include "gpowerprofilemonitordbus.h" |
||||
+#include "gpowerprofilemonitorportal.h" |
||||
#ifdef G_OS_WIN32 |
||||
#include "gregistrysettingsbackend.h" |
||||
#include "giowin32-priv.h" |
||||
@@ -1305,6 +1306,7 @@ _g_io_modules_ensure_loaded (void) |
||||
g_type_ensure (g_memory_monitor_dbus_get_type ()); |
||||
g_type_ensure (g_memory_monitor_portal_get_type ()); |
||||
g_type_ensure (g_network_monitor_portal_get_type ()); |
||||
+ g_type_ensure (g_power_profile_monitor_portal_get_type ()); |
||||
g_type_ensure (g_proxy_resolver_portal_get_type ()); |
||||
#endif |
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 |
||||
diff --git a/gio/gpowerprofilemonitorportal.c b/gio/gpowerprofilemonitorportal.c |
||||
new file mode 100644 |
||||
index 000000000..bb1b4fd15 |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitorportal.c |
||||
@@ -0,0 +1,182 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2021 Red Hat, Inc. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#include "config.h" |
||||
+ |
||||
+#include "gpowerprofilemonitor.h" |
||||
+#include "gpowerprofilemonitorportal.h" |
||||
+#include "gdbuserror.h" |
||||
+#include "gdbusproxy.h" |
||||
+#include "ginitable.h" |
||||
+#include "gioerror.h" |
||||
+#include "giomodule-priv.h" |
||||
+#include "gportalsupport.h" |
||||
+ |
||||
+#define G_POWER_PROFILE_MONITOR_PORTAL_GET_INITABLE_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_INITABLE, GInitable)) |
||||
+ |
||||
+static void g_power_profile_monitor_portal_iface_init (GPowerProfileMonitorInterface *iface); |
||||
+static void g_power_profile_monitor_portal_initable_iface_init (GInitableIface *iface); |
||||
+ |
||||
+typedef enum |
||||
+{ |
||||
+ PROP_POWER_SAVER_ENABLED = 1, |
||||
+} GPowerProfileMonitorPortalProperty; |
||||
+ |
||||
+struct _GPowerProfileMonitorPortal |
||||
+{ |
||||
+ GObject parent_instance; |
||||
+ |
||||
+ GDBusProxy *proxy; |
||||
+ gulong signal_id; |
||||
+ gboolean power_saver_enabled; |
||||
+}; |
||||
+ |
||||
+G_DEFINE_TYPE_WITH_CODE (GPowerProfileMonitorPortal, g_power_profile_monitor_portal, G_TYPE_OBJECT, |
||||
+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, |
||||
+ g_power_profile_monitor_portal_initable_iface_init) |
||||
+ G_IMPLEMENT_INTERFACE (G_TYPE_POWER_PROFILE_MONITOR, |
||||
+ g_power_profile_monitor_portal_iface_init) |
||||
+ _g_io_modules_ensure_extension_points_registered (); |
||||
+ g_io_extension_point_implement (G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME, |
||||
+ g_define_type_id, |
||||
+ "portal", |
||||
+ 40)) |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_init (GPowerProfileMonitorPortal *portal) |
||||
+{ |
||||
+} |
||||
+ |
||||
+static void |
||||
+proxy_properties_changed (GDBusProxy *proxy, |
||||
+ GVariant *changed_properties, |
||||
+ GStrv invalidated_properties, |
||||
+ gpointer user_data) |
||||
+{ |
||||
+ GPowerProfileMonitorPortal *ppm = user_data; |
||||
+ gboolean power_saver_enabled; |
||||
+ |
||||
+ if (!g_variant_lookup (changed_properties, "power-saver-enabled", "b", &power_saver_enabled)) |
||||
+ return; |
||||
+ |
||||
+ if (power_saver_enabled == ppm->power_saver_enabled) |
||||
+ return; |
||||
+ |
||||
+ ppm->power_saver_enabled = power_saver_enabled; |
||||
+ g_object_notify (G_OBJECT (ppm), "power-saver-enabled"); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_get_property (GObject *object, |
||||
+ guint prop_id, |
||||
+ GValue *value, |
||||
+ GParamSpec *pspec) |
||||
+{ |
||||
+ GPowerProfileMonitorPortal *ppm = G_POWER_PROFILE_MONITOR_PORTAL (object); |
||||
+ |
||||
+ switch ((GPowerProfileMonitorPortalProperty) prop_id) |
||||
+ { |
||||
+ case PROP_POWER_SAVER_ENABLED: |
||||
+ g_value_set_boolean (value, ppm->power_saver_enabled); |
||||
+ break; |
||||
+ |
||||
+ default: |
||||
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
||||
+ } |
||||
+} |
||||
+ |
||||
+static gboolean |
||||
+g_power_profile_monitor_portal_initable_init (GInitable *initable, |
||||
+ GCancellable *cancellable, |
||||
+ GError **error) |
||||
+{ |
||||
+ GPowerProfileMonitorPortal *ppm = G_POWER_PROFILE_MONITOR_PORTAL (initable); |
||||
+ GDBusProxy *proxy; |
||||
+ gchar *name_owner; |
||||
+ |
||||
+ if (!glib_should_use_portal ()) |
||||
+ { |
||||
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Not using portals"); |
||||
+ return FALSE; |
||||
+ } |
||||
+ |
||||
+ proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, |
||||
+ G_DBUS_PROXY_FLAGS_NONE, |
||||
+ NULL, |
||||
+ "org.freedesktop.portal.Desktop", |
||||
+ "/org/freedesktop/portal/desktop", |
||||
+ "org.freedesktop.portal.PowerProfileMonitor", |
||||
+ cancellable, |
||||
+ error); |
||||
+ if (!proxy) |
||||
+ return FALSE; |
||||
+ |
||||
+ name_owner = g_dbus_proxy_get_name_owner (proxy); |
||||
+ |
||||
+ if (name_owner == NULL) |
||||
+ { |
||||
+ g_object_unref (proxy); |
||||
+ g_set_error (error, |
||||
+ G_DBUS_ERROR, |
||||
+ G_DBUS_ERROR_NAME_HAS_NO_OWNER, |
||||
+ "Desktop portal not found"); |
||||
+ return FALSE; |
||||
+ } |
||||
+ |
||||
+ g_free (name_owner); |
||||
+ |
||||
+ ppm->signal_id = g_signal_connect (proxy, "g-properties-changed", |
||||
+ G_CALLBACK (proxy_properties_changed), ppm); |
||||
+ |
||||
+ ppm->proxy = g_steal_pointer (&proxy); |
||||
+ |
||||
+ return TRUE; |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_finalize (GObject *object) |
||||
+{ |
||||
+ GPowerProfileMonitorPortal *ppm = G_POWER_PROFILE_MONITOR_PORTAL (object); |
||||
+ |
||||
+ g_clear_signal_handler (&ppm->signal_id, ppm->proxy); |
||||
+ g_clear_object (&ppm->proxy); |
||||
+ |
||||
+ G_OBJECT_CLASS (g_power_profile_monitor_portal_parent_class)->finalize (object); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_class_init (GPowerProfileMonitorPortalClass *nl_class) |
||||
+{ |
||||
+ GObjectClass *gobject_class = G_OBJECT_CLASS (nl_class); |
||||
+ |
||||
+ gobject_class->get_property = g_power_profile_monitor_portal_get_property; |
||||
+ gobject_class->finalize = g_power_profile_monitor_portal_finalize; |
||||
+ |
||||
+ g_object_class_override_property (gobject_class, PROP_POWER_SAVER_ENABLED, "power-saver-enabled"); |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_iface_init (GPowerProfileMonitorInterface *monitor_iface) |
||||
+{ |
||||
+} |
||||
+ |
||||
+static void |
||||
+g_power_profile_monitor_portal_initable_iface_init (GInitableIface *iface) |
||||
+{ |
||||
+ iface->init = g_power_profile_monitor_portal_initable_init; |
||||
+} |
||||
diff --git a/gio/gpowerprofilemonitorportal.h b/gio/gpowerprofilemonitorportal.h |
||||
new file mode 100644 |
||||
index 000000000..b91a14610 |
||||
--- /dev/null |
||||
+++ b/gio/gpowerprofilemonitorportal.h |
||||
@@ -0,0 +1,31 @@ |
||||
+/* GIO - GLib Input, Output and Streaming Library |
||||
+ * |
||||
+ * Copyright 2021 Red Hat, Inc. |
||||
+ * |
||||
+ * This library is free software; you can redistribute it and/or |
||||
+ * modify it under the terms of the GNU Lesser General Public |
||||
+ * License as published by the Free Software Foundation; either |
||||
+ * version 2.1 of the License, or (at your option) any later version. |
||||
+ * |
||||
+ * This library is distributed in the hope that it will be useful, |
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
+ * Lesser General Public License for more details. |
||||
+ * |
||||
+ * You should have received a copy of the GNU Lesser General |
||||
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. |
||||
+ */ |
||||
+ |
||||
+#ifndef __G_POWER_PROFILE_MONITOR_PORTAL_H__ |
||||
+#define __G_POWER_PROFILE_MONITOR_PORTAL_H__ |
||||
+ |
||||
+#include <glib-object.h> |
||||
+ |
||||
+G_BEGIN_DECLS |
||||
+ |
||||
+#define G_TYPE_POWER_PROFILE_MONITOR_PORTAL (g_power_profile_monitor_portal_get_type ()) |
||||
+G_DECLARE_FINAL_TYPE (GPowerProfileMonitorPortal, g_power_profile_monitor_portal, G, POWER_PROFILE_MONITOR_PORTAL, GObject) |
||||
+ |
||||
+G_END_DECLS |
||||
+ |
||||
+#endif /* __G_POWER_PROFILE_MONITOR_PORTAL_H__ */ |
||||
diff --git a/gio/meson.build b/gio/meson.build |
||||
index d5838ed8a..ac3373f2b 100644 |
||||
--- a/gio/meson.build |
||||
+++ b/gio/meson.build |
||||
@@ -383,6 +383,7 @@ if host_system != 'windows' |
||||
'gopenuriportal.c', |
||||
'gmemorymonitorportal.c', |
||||
'gnetworkmonitorportal.c', |
||||
+ 'gpowerprofilemonitorportal.c', |
||||
'gproxyresolverportal.c', |
||||
'gtrashportal.c', |
||||
'gportalsupport.c', |
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 18eb29897d80bf662d58bd11a89617ddd7ebfeed Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Tue, 10 Aug 2021 10:58:53 +0200 |
||||
Subject: [PATCH 2/4] gio: Add GPowerProfileMonitor tests |
||||
|
||||
Tests both the portal and direct D-Bus variants. |
||||
--- |
||||
gio/tests/meson.build | 14 ++- |
||||
gio/tests/power-profile-monitor-dbus.py.in | 107 ++++++++++++++++ |
||||
gio/tests/power-profile-monitor-portal.py.in | 126 +++++++++++++++++++ |
||||
3 files changed, 241 insertions(+), 6 deletions(-) |
||||
create mode 100755 gio/tests/power-profile-monitor-dbus.py.in |
||||
create mode 100755 gio/tests/power-profile-monitor-portal.py.in |
||||
|
||||
diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
||||
index fc2055101..5dbfb8e60 100644 |
||||
--- a/gio/tests/meson.build |
||||
+++ b/gio/tests/meson.build |
||||
@@ -541,27 +541,29 @@ if installed_tests_enabled |
||||
install_subdir('static-link', install_dir : installed_tests_execdir) |
||||
install_data('static-link.py', install_dir : installed_tests_execdir) |
||||
|
||||
- memory_monitor_tests = [ |
||||
+ monitor_tests = [ |
||||
'memory-monitor-dbus', |
||||
'memory-monitor-portal', |
||||
+ 'power-profile-monitor-dbus', |
||||
+ 'power-profile-monitor-portal' |
||||
] |
||||
|
||||
- foreach memory_monitor_test : memory_monitor_tests |
||||
+ foreach monitor_test : monitor_tests |
||||
cdata = configuration_data() |
||||
cdata.set('installed_tests_dir', installed_tests_execdir) |
||||
- cdata.set('program', memory_monitor_test + '.py') |
||||
+ cdata.set('program', monitor_test + '.py') |
||||
cdata.set('env', '') |
||||
configure_file( |
||||
input: installed_tests_template_tap, |
||||
- output: memory_monitor_test + '.test', |
||||
+ output: monitor_test + '.test', |
||||
install_dir: installed_tests_metadir, |
||||
configuration: cdata |
||||
) |
||||
cdata = configuration_data() |
||||
cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir'))) |
||||
configure_file( |
||||
- input: memory_monitor_test + '.py.in', |
||||
- output: memory_monitor_test + '.py', |
||||
+ input: monitor_test + '.py.in', |
||||
+ output: monitor_test + '.py', |
||||
install_dir : installed_tests_execdir, |
||||
configuration: cdata, |
||||
) |
||||
diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in |
||||
new file mode 100755 |
||||
index 000000000..06e594f4a |
||||
--- /dev/null |
||||
+++ b/gio/tests/power-profile-monitor-dbus.py.in |
||||
@@ -0,0 +1,107 @@ |
||||
+#!/usr/bin/python3 |
||||
+ |
||||
+# This program is free software; you can redistribute it and/or modify it under |
||||
+# the terms of the GNU Lesser General Public License as published by the Free |
||||
+# Software Foundation; either version 3 of the License, or (at your option) any |
||||
+# later version. See http://www.gnu.org/copyleft/lgpl.html for the full text |
||||
+# of the license. |
||||
+ |
||||
+__author__ = 'Bastien Nocera' |
||||
+__email__ = 'hadess@hadess.net' |
||||
+__copyright__ = '(c) 2019, 2021 Red Hat Inc.' |
||||
+__license__ = 'LGPL 3+' |
||||
+ |
||||
+import unittest |
||||
+import sys |
||||
+import subprocess |
||||
+import fcntl |
||||
+import os |
||||
+import time |
||||
+ |
||||
+import taptestrunner |
||||
+ |
||||
+try: |
||||
+ # Do all non-standard imports here so we can skip the tests if any |
||||
+ # needed packages are not available. |
||||
+ import dbus |
||||
+ import dbus.mainloop.glib |
||||
+ import dbusmock |
||||
+ from gi.repository import GLib |
||||
+ from gi.repository import Gio |
||||
+ |
||||
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) |
||||
+ |
||||
+ class TestPowerProfileMonitor(dbusmock.DBusTestCase): |
||||
+ '''Test GPowerProfileMonitorDBus''' |
||||
+ |
||||
+ @classmethod |
||||
+ def setUpClass(klass): |
||||
+ klass.start_system_bus() |
||||
+ klass.dbus_con = klass.get_dbus(True) |
||||
+ |
||||
+ def setUp(self): |
||||
+ try: |
||||
+ Gio.PowerProfileMonitor |
||||
+ except AttributeError: |
||||
+ raise unittest.SkipTest('Power Profile Monitor not in ' |
||||
+ 'introspection data. Requires ' |
||||
+ 'GObject-Introspection ≥ 1.63.2') # FIXME version |
||||
+ try: |
||||
+ (self.p_mock, self.obj_ppd) = self.spawn_server_template( |
||||
+ 'power_profiles_daemon', {}, stdout=subprocess.PIPE) |
||||
+ except ModuleNotFoundError: |
||||
+ raise unittest.SkipTest("power-profiles-daemon dbusmock template not " |
||||
+ "found. Requires dbusmock > 0.23.1.") # FIXME version |
||||
+ # set log to nonblocking |
||||
+ flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL) |
||||
+ fcntl.fcntl(self.p_mock.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK) |
||||
+ self.power_saver_enabled = False |
||||
+ self.dbus_props = dbus.Interface(self.obj_ppd, dbus.PROPERTIES_IFACE) |
||||
+ self.power_profile_monitor = Gio.PowerProfileMonitor.dup_default() |
||||
+ self.power_profile_monitor.connect("notify::power-saver-enabled", self.power_saver_enabled_cb) |
||||
+ self.mainloop = GLib.MainLoop() |
||||
+ self.main_context = self.mainloop.get_context() |
||||
+ |
||||
+ def tearDown(self): |
||||
+ self.p_mock.terminate() |
||||
+ self.p_mock.wait() |
||||
+ |
||||
+ def assertEventually(self, condition, message=None, timeout=50): |
||||
+ '''Assert that condition function eventually returns True. |
||||
+ |
||||
+ Timeout is in deciseconds, defaulting to 50 (5 seconds). message is |
||||
+ printed on failure. |
||||
+ ''' |
||||
+ while timeout >= 0: |
||||
+ context = GLib.MainContext.default() |
||||
+ while context.iteration(False): |
||||
+ pass |
||||
+ if condition(): |
||||
+ break |
||||
+ timeout -= 1 |
||||
+ time.sleep(0.1) |
||||
+ else: |
||||
+ self.fail(message or 'timed out waiting for ' + str(condition)) |
||||
+ |
||||
+ def power_saver_enabled_cb(self, spec, data): |
||||
+ self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() |
||||
+ self.main_context.wakeup() |
||||
+ |
||||
+ def test_power_profile_power_saver_enabled(self): |
||||
+ '''power-saver-enabled property''' |
||||
+ |
||||
+ self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) |
||||
+ self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) |
||||
+ self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) |
||||
+ |
||||
+ self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) |
||||
+ self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) |
||||
+ |
||||
+except ImportError as e: |
||||
+ @unittest.skip("Cannot import %s" % e.name) |
||||
+ class TestPowerProfileMonitor(unittest.TestCase): |
||||
+ def test_power_profile_power_saver_enabled(self): |
||||
+ pass |
||||
+ |
||||
+if __name__ == '__main__': |
||||
+ unittest.main(testRunner=taptestrunner.TAPTestRunner()) |
||||
diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in |
||||
new file mode 100755 |
||||
index 000000000..960a62232 |
||||
--- /dev/null |
||||
+++ b/gio/tests/power-profile-monitor-portal.py.in |
||||
@@ -0,0 +1,126 @@ |
||||
+#!/usr/bin/python3 |
||||
+ |
||||
+# This program is free software; you can redistribute it and/or modify it under |
||||
+# the terms of the GNU Lesser General Public License as published by the Free |
||||
+# Software Foundation; either version 3 of the License, or (at your option) any |
||||
+# later version. See http://www.gnu.org/copyleft/lgpl.html for the full text |
||||
+# of the license. |
||||
+ |
||||
+__author__ = 'Bastien Nocera' |
||||
+__email__ = 'hadess@hadess.net' |
||||
+__copyright__ = '(c) 2021 Red Hat Inc.' |
||||
+__license__ = 'LGPL 3+' |
||||
+ |
||||
+import unittest |
||||
+import sys |
||||
+import subprocess |
||||
+import fcntl |
||||
+import os |
||||
+import time |
||||
+ |
||||
+import taptestrunner |
||||
+ |
||||
+try: |
||||
+ # Do all non-standard imports here so we can skip the tests if any |
||||
+ # needed packages are not available. |
||||
+ import dbus |
||||
+ import dbus.mainloop.glib |
||||
+ import dbusmock |
||||
+ from gi.repository import GLib |
||||
+ from gi.repository import Gio |
||||
+ |
||||
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) |
||||
+ |
||||
+ # XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal") |
||||
+ XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal" |
||||
+ |
||||
+ class TestPowerProfileMonitorPortal(dbusmock.DBusTestCase): |
||||
+ '''Test GPowerProfileMonitorPortal''' |
||||
+ |
||||
+ @classmethod |
||||
+ def setUpClass(klass): |
||||
+ klass.start_system_bus() |
||||
+ klass.dbus_con = klass.get_dbus(True) |
||||
+ # Start session bus so that xdg-desktop-portal can run on it |
||||
+ klass.start_session_bus() |
||||
+ |
||||
+ def setUp(self): |
||||
+ try: |
||||
+ Gio.PowerProfileMonitor |
||||
+ except AttributeError: |
||||
+ raise unittest.SkipTest('Power Profile Monitor not in ' |
||||
+ 'introspection data. Requires ' |
||||
+ 'GObject-Introspection > 1.69.0') |
||||
+ try: |
||||
+ (self.p_mock, self.obj_ppd) = self.spawn_server_template( |
||||
+ 'power_profiles_daemon', {}, stdout=subprocess.PIPE) |
||||
+ except ModuleNotFoundError: |
||||
+ raise unittest.SkipTest("power-profiles-daemon dbusmock template not " |
||||
+ "found. Requires dbusmock > 0.23.1.") |
||||
+ # set log to nonblocking |
||||
+ flags = fcntl.fcntl(self.p_mock.stdout, fcntl.F_GETFL) |
||||
+ fcntl.fcntl(self.p_mock.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK) |
||||
+ self.power_saver_enabled = False |
||||
+ self.dbus_props = dbus.Interface(self.obj_ppd, dbus.PROPERTIES_IFACE) |
||||
+ try: |
||||
+ self.xdp = subprocess.Popen([XDG_DESKTOP_PORTAL_PATH]) |
||||
+ except FileNotFoundError: |
||||
+ raise unittest.SkipTest("xdg-desktop-portal not available") |
||||
+ |
||||
+ try: |
||||
+ self.wait_for_bus_object('org.freedesktop.portal.Desktop', |
||||
+ '/org/freedesktop/portal/desktop') |
||||
+ except: |
||||
+ raise |
||||
+ # subprocess.Popen(['gdbus', 'monitor', '--session', '--dest', 'org.freedesktop.portal.Desktop']) |
||||
+ |
||||
+ os.environ['GTK_USE_PORTAL'] = "1" |
||||
+ self.power_profile_monitor = Gio.PowerProfileMonitor.dup_default() |
||||
+ assert("GPowerProfileMonitorPortal" in str(self.power_profile_monitor)) |
||||
+ self.power_profile_monitor.connect("notify::power-saver-enabled", self.power_saver_enabled_cb) |
||||
+ self.mainloop = GLib.MainLoop() |
||||
+ self.main_context = self.mainloop.get_context() |
||||
+ |
||||
+ def tearDown(self): |
||||
+ self.p_mock.terminate() |
||||
+ self.p_mock.wait() |
||||
+ |
||||
+ def assertEventually(self, condition, message=None, timeout=50): |
||||
+ '''Assert that condition function eventually returns True. |
||||
+ |
||||
+ Timeout is in deciseconds, defaulting to 50 (5 seconds). message is |
||||
+ printed on failure. |
||||
+ ''' |
||||
+ while timeout >= 0: |
||||
+ context = GLib.MainContext.default() |
||||
+ while context.iteration(False): |
||||
+ pass |
||||
+ if condition(): |
||||
+ break |
||||
+ timeout -= 1 |
||||
+ time.sleep(0.1) |
||||
+ else: |
||||
+ self.fail(message or 'timed out waiting for ' + str(condition)) |
||||
+ |
||||
+ def power_saver_enabled_cb(self, spec, data): |
||||
+ self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() |
||||
+ self.main_context.wakeup() |
||||
+ |
||||
+ def test_power_profile_power_saver_enabled_portal(self): |
||||
+ '''power-saver-enabled property''' |
||||
+ |
||||
+ self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) |
||||
+ self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) |
||||
+ self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) |
||||
+ |
||||
+ self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) |
||||
+ self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) |
||||
+ |
||||
+except ImportError as e: |
||||
+ @unittest.skip("Cannot import %s" % e.name) |
||||
+ class TestPowerProfileMonitorPortal(unittest.TestCase): |
||||
+ def test_power_profile_power_saver_enabled_portal(self): |
||||
+ pass |
||||
+ |
||||
+if __name__ == '__main__': |
||||
+ unittest.main(testRunner=taptestrunner.TAPTestRunner()) |
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 66acea8418eb3d8e46bb6f93dc0c3f13a1f7822b Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Wed, 11 Aug 2021 15:37:40 +0200 |
||||
Subject: [PATCH 3/4] gio: Remove left-over debug statement from memory monitor |
||||
portal test |
||||
|
||||
--- |
||||
gio/tests/memory-monitor-portal.py.in | 1 - |
||||
1 file changed, 1 deletion(-) |
||||
|
||||
diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in |
||||
index cb4a960eb..f5fd2283f 100755 |
||||
--- a/gio/tests/memory-monitor-portal.py.in |
||||
+++ b/gio/tests/memory-monitor-portal.py.in |
||||
@@ -31,7 +31,6 @@ try: |
||||
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) |
||||
|
||||
- # XDG_DESKTOP_PORTAL_PATH = os.path.expanduser("~/.cache/jhbuild/build/xdg-desktop-portal/xdg-desktop-portal") |
||||
XDG_DESKTOP_PORTAL_PATH = "@libexecdir@/xdg-desktop-portal" |
||||
|
||||
class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase): |
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 2e9842cafc73a7fb94cfde7937e125e1a91f35f8 Mon Sep 17 00:00:00 2001 |
||||
From: Bastien Nocera <hadess@hadess.net> |
||||
Date: Wed, 11 Aug 2021 15:38:12 +0200 |
||||
Subject: [PATCH 4/4] gio: Simplify memory monitor tests by using |
||||
assertEventually() helper |
||||
|
||||
assertEventually is a helper used in a number of projects that use |
||||
dbusmock. |
||||
|
||||
See https://github.com/martinpitt/python-dbusmock/issues/82 |
||||
--- |
||||
gio/tests/memory-monitor-dbus.py.in | 31 ++++++++++++++++----------- |
||||
gio/tests/memory-monitor-portal.py.in | 31 ++++++++++++++++----------- |
||||
2 files changed, 38 insertions(+), 24 deletions(-) |
||||
|
||||
diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in |
||||
index 7823e7309..e8ac28faf 100755 |
||||
--- a/gio/tests/memory-monitor-dbus.py.in |
||||
+++ b/gio/tests/memory-monitor-dbus.py.in |
||||
@@ -66,6 +66,23 @@ try: |
||||
self.p_mock.terminate() |
||||
self.p_mock.wait() |
||||
|
||||
+ def assertEventually(self, condition, message=None, timeout=50): |
||||
+ '''Assert that condition function eventually returns True. |
||||
+ |
||||
+ Timeout is in deciseconds, defaulting to 50 (5 seconds). message is |
||||
+ printed on failure. |
||||
+ ''' |
||||
+ while timeout >= 0: |
||||
+ context = GLib.MainContext.default() |
||||
+ while context.iteration(False): |
||||
+ pass |
||||
+ if condition(): |
||||
+ break |
||||
+ timeout -= 1 |
||||
+ time.sleep(0.1) |
||||
+ else: |
||||
+ self.fail(message or 'timed out waiting for ' + str(condition)) |
||||
+ |
||||
def memory_warning_cb(self, monitor, level): |
||||
self.last_warning = level |
||||
self.main_context.wakeup() |
||||
@@ -82,21 +99,11 @@ try: |
||||
|
||||
self.dbusmock.EmitWarning(100) |
||||
# Wait 2 seconds or until warning |
||||
- timeout = 2 |
||||
- while timeout > 0 and self.last_warning != 100: |
||||
- time.sleep(0.5) |
||||
- timeout -= 0.5 |
||||
- self.main_context.iteration(False) |
||||
- self.assertEqual(self.last_warning, 100) |
||||
+ self.assertEventually(self.last_warning == 100, "'100' low-memory warning not received", 20) |
||||
|
||||
self.dbusmock.EmitWarning(255) |
||||
# Wait 2 seconds or until warning |
||||
- timeout = 2 |
||||
- while timeout > 0 and self.last_warning != 255: |
||||
- time.sleep(0.5) |
||||
- timeout -= 0.5 |
||||
- self.main_context.iteration(False) |
||||
- self.assertEqual(self.last_warning, 255) |
||||
+ self.assertEventually(self.last_warning == 255, "'255' low-memory warning not received", 20) |
||||
|
||||
except ImportError as e: |
||||
@unittest.skip("Cannot import %s" % e.name) |
||||
diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in |
||||
index f5fd2283f..36d5094d3 100755 |
||||
--- a/gio/tests/memory-monitor-portal.py.in |
||||
+++ b/gio/tests/memory-monitor-portal.py.in |
||||
@@ -84,6 +84,23 @@ try: |
||||
self.p_mock.terminate() |
||||
self.p_mock.wait() |
||||
|
||||
+ def assertEventually(self, condition, message=None, timeout=50): |
||||
+ '''Assert that condition function eventually returns True. |
||||
+ |
||||
+ Timeout is in deciseconds, defaulting to 50 (5 seconds). message is |
||||
+ printed on failure. |
||||
+ ''' |
||||
+ while timeout >= 0: |
||||
+ context = GLib.MainContext.default() |
||||
+ while context.iteration(False): |
||||
+ pass |
||||
+ if condition(): |
||||
+ break |
||||
+ timeout -= 1 |
||||
+ time.sleep(0.1) |
||||
+ else: |
||||
+ self.fail(message or 'timed out waiting for ' + str(condition)) |
||||
+ |
||||
def portal_memory_warning_cb(self, monitor, level): |
||||
self.last_warning = level |
||||
self.main_context.wakeup() |
||||
@@ -100,21 +117,11 @@ try: |
||||
|
||||
self.dbusmock.EmitWarning(100) |
||||
# Wait 2 seconds or until warning |
||||
- timeout = 2 |
||||
- while timeout > 0 and self.last_warning != 100: |
||||
- time.sleep(0.5) |
||||
- timeout -= 0.5 |
||||
- self.main_context.iteration(False) |
||||
- self.assertEqual(self.last_warning, 100) |
||||
+ self.assertEventually(self.last_warning == 100, "'100' low-memory warning not received", 20) |
||||
|
||||
self.dbusmock.EmitWarning(255) |
||||
# Wait 2 seconds or until warning |
||||
- timeout = 2 |
||||
- while timeout > 0 and self.last_warning != 255: |
||||
- time.sleep(0.5) |
||||
- timeout -= 0.5 |
||||
- self.main_context.iteration(False) |
||||
- self.assertEqual(self.last_warning, 255) |
||||
+ self.assertEventually(self.last_warning == 255, "'255' low-memory warning not received", 20) |
||||
|
||||
except ImportError as e: |
||||
@unittest.skip("Cannot import %s" % e.name) |
||||
-- |
||||
GitLab |
||||
|
@ -0,0 +1,49 @@
@@ -0,0 +1,49 @@
|
||||
From b6036e23b0477be147211b4e21a6b49cd4d6c9a0 Mon Sep 17 00:00:00 2001 |
||||
From: Jamie Bainbridge <jamie.bainbridge@gmail.com> |
||||
Date: Wed, 8 Sep 2021 12:08:17 +1000 |
||||
Subject: [PATCH] gutils: Avoid segfault in g_get_user_database_entry |
||||
|
||||
g_get_user_database_entry() uses variable pwd to store the contents of |
||||
the call to getpwnam_r(), then capitalises the first letter of pw_name |
||||
with g_ascii_toupper (pw->pw_name[0]). |
||||
|
||||
However, as per the getpwnam manpage, the result of that call "may point |
||||
to a static area". When this happens, GLib is trying to edit static |
||||
memory which belongs to a shared library, so segfaults. |
||||
|
||||
Instead, copy pw_name off to a temporary variable, set uppercase on |
||||
that variable, and use the variable to join into the desired string. |
||||
Free the new variable after it is no longer needed. |
||||
|
||||
Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com> |
||||
--- |
||||
glib/gutils.c | 7 +++++-- |
||||
1 file changed, 5 insertions(+), 2 deletions(-) |
||||
|
||||
diff --git a/glib/gutils.c b/glib/gutils.c |
||||
index b7a2113d4..4bccd7229 100644 |
||||
--- a/glib/gutils.c |
||||
+++ b/glib/gutils.c |
||||
@@ -692,14 +692,17 @@ g_get_user_database_entry (void) |
||||
{ |
||||
gchar **gecos_fields; |
||||
gchar **name_parts; |
||||
+ gchar *uppercase_pw_name; |
||||
|
||||
/* split the gecos field and substitute '&' */ |
||||
gecos_fields = g_strsplit (pw->pw_gecos, ",", 0); |
||||
name_parts = g_strsplit (gecos_fields[0], "&", 0); |
||||
- pw->pw_name[0] = g_ascii_toupper (pw->pw_name[0]); |
||||
- e.real_name = g_strjoinv (pw->pw_name, name_parts); |
||||
+ uppercase_pw_name = g_strdup (pw->pw_name); |
||||
+ uppercase_pw_name[0] = g_ascii_toupper (uppercase_pw_name[0]); |
||||
+ e.real_name = g_strjoinv (uppercase_pw_name, name_parts); |
||||
g_strfreev (gecos_fields); |
||||
g_strfreev (name_parts); |
||||
+ g_free (uppercase_pw_name); |
||||
} |
||||
#endif |
||||
|
||||
-- |
||||
GitLab |
||||
|
@ -0,0 +1,129 @@
@@ -0,0 +1,129 @@
|
||||
From f419966808475cb6c0f0ba2f63967876218ffdaf Mon Sep 17 00:00:00 2001 |
||||
From: Julian Andres Klode <julian.klode@canonical.com> |
||||
Date: Tue, 12 Oct 2021 12:01:50 +0200 |
||||
Subject: [PATCH 1/2] gnetworkmonitornm: Stop using removed PropertiesChanged |
||||
signal |
||||
|
||||
Use the org.freedesktop.DBus.Properties interface to listen |
||||
to PropertiesChanged signals on /org/freedesktop/NetworkManager. |
||||
|
||||
NetworkManager used to provide its own legacy PropertiesChanged |
||||
signal, but that was dropped in |
||||
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/853 |
||||
|
||||
This requires NetworkManager >= 1.2 (2016) |
||||
|
||||
Fixes: #2505 |
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1946196 |
||||
--- |
||||
gio/gnetworkmonitornm.c | 29 +++++++---------------------- |
||||
1 file changed, 7 insertions(+), 22 deletions(-) |
||||
|
||||
diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c |
||||
index 5a36a0ba1..6a6d1d666 100644 |
||||
--- a/gio/gnetworkmonitornm.c |
||||
+++ b/gio/gnetworkmonitornm.c |
||||
@@ -267,29 +267,14 @@ update_cached_property (GDBusProxy *proxy, |
||||
} |
||||
|
||||
static void |
||||
-proxy_signal_cb (GDBusProxy *proxy, |
||||
- const gchar *sender_name, |
||||
- const gchar *signal_name, |
||||
- GVariant *parameters, |
||||
- GNetworkMonitorNM *nm) |
||||
+proxy_properties_changed_cb (GDBusProxy *proxy, |
||||
+ GVariant *changed_properties, |
||||
+ GStrv invalidated_properties, |
||||
+ GNetworkMonitorNM *nm) |
||||
{ |
||||
- GVariant *asv; |
||||
GVariantDict *dict; |
||||
|
||||
- if (g_strcmp0 (signal_name, "PropertiesChanged") != 0) |
||||
- return; |
||||
- |
||||
- g_variant_get (parameters, "(@a{sv})", &asv); |
||||
- if (!asv) |
||||
- return; |
||||
- |
||||
- dict = g_variant_dict_new (asv); |
||||
- g_variant_unref (asv); |
||||
- if (!dict) |
||||
- { |
||||
- g_warning ("Failed to handle PropertiesChanged signal from NetworkManager"); |
||||
- return; |
||||
- } |
||||
+ dict = g_variant_dict_new (changed_properties); |
||||
|
||||
update_cached_property (nm->priv->proxy, "Connectivity", dict); |
||||
|
||||
@@ -361,8 +346,8 @@ g_network_monitor_nm_initable_init (GInitable *initable, |
||||
return FALSE; |
||||
} |
||||
|
||||
- nm->priv->signal_id = g_signal_connect (G_OBJECT (proxy), "g-signal", |
||||
- G_CALLBACK (proxy_signal_cb), nm); |
||||
+ nm->priv->signal_id = g_signal_connect (G_OBJECT (proxy), "g-properties-changed", |
||||
+ G_CALLBACK (proxy_properties_changed_cb), nm); |
||||
nm->priv->proxy = proxy; |
||||
sync_properties (nm, FALSE); |
||||
|
||||
-- |
||||
GitLab |
||||
|
||||
|
||||
From 643fc7ea49e818310f6b3f6e4ebe621c7a4d6bd7 Mon Sep 17 00:00:00 2001 |
||||
From: Julian Andres Klode <julian.klode@canonical.com> |
||||
Date: Tue, 12 Oct 2021 17:31:42 +0200 |
||||
Subject: [PATCH 2/2] gnetworkmonitornm: Do not re-update cached property |
||||
|
||||
GDBusProxy already takes care of updating the cached property |
||||
before emitting the signal, so there is no need to do this |
||||
a second time ourselves. |
||||
--- |
||||
gio/gnetworkmonitornm.c | 22 ---------------------- |
||||
1 file changed, 22 deletions(-) |
||||
|
||||
diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c |
||||
index 6a6d1d666..a8040fb36 100644 |
||||
--- a/gio/gnetworkmonitornm.c |
||||
+++ b/gio/gnetworkmonitornm.c |
||||
@@ -252,34 +252,12 @@ sync_properties (GNetworkMonitorNM *nm, |
||||
} |
||||
} |
||||
|
||||
-static void |
||||
-update_cached_property (GDBusProxy *proxy, |
||||
- const char *property_name, |
||||
- GVariantDict *dict) |
||||
-{ |
||||
- GVariant *v; |
||||
- |
||||
- v = g_variant_dict_lookup_value (dict, property_name, NULL); |
||||
- if (!v) |
||||
- return; |
||||
- g_dbus_proxy_set_cached_property (proxy, property_name, v); |
||||
- g_variant_unref (v); |
||||
-} |
||||
- |
||||
static void |
||||
proxy_properties_changed_cb (GDBusProxy *proxy, |
||||
GVariant *changed_properties, |
||||
GStrv invalidated_properties, |
||||
GNetworkMonitorNM *nm) |
||||
{ |
||||
- GVariantDict *dict; |
||||
- |
||||
- dict = g_variant_dict_new (changed_properties); |
||||
- |
||||
- update_cached_property (nm->priv->proxy, "Connectivity", dict); |
||||
- |
||||
- g_variant_dict_unref (dict); |
||||
- |
||||
sync_properties (nm, TRUE); |
||||
} |
||||
|
||||
-- |
||||
GitLab |
||||
|
@ -0,0 +1,132 @@
@@ -0,0 +1,132 @@
|
||||
From a879d08e912a4421786b44af479f94f7b4503f5a Mon Sep 17 00:00:00 2001 |
||||
From: Philip Withnall <pwithnall@endlessos.org> |
||||
Date: Mon, 17 Jan 2022 15:27:24 +0000 |
||||
Subject: [PATCH] gspawn: Report errors with closing file descriptors between |
||||
fork/exec |
||||
MIME-Version: 1.0 |
||||
Content-Type: text/plain; charset=UTF-8 |
||||
Content-Transfer-Encoding: 8bit |
||||
|
||||
If a seccomp policy is set up incorrectly so that it returns `EPERM` for |
||||
`close_range()` rather than `ENOSYS` due to it not being recognised, no |
||||
error would previously be reported from GLib, but some file descriptors |
||||
wouldn’t be closed, and that would cause a hung zombie process. The |
||||
zombie process would be waiting for one half of a socket to be closed. |
||||
|
||||
Fix that by correctly propagating errors from `close_range()` back to the |
||||
parent process so they can be reported correctly. |
||||
|
||||
Distributions which aren’t yet carrying the Docker fix to correctly |
||||
return `ENOSYS` from unrecognised syscalls may want to temporarily carry |
||||
an additional patch to fall back to `safe_fdwalk()` if `close_range()` |
||||
fails with `EPERM`. This change will not be accepted upstream as `EPERM` |
||||
is not the right error for `close_range()` to be returning. |
||||
|
||||
Signed-off-by: Philip Withnall <pwithnall@endlessos.org> |
||||
|
||||
Fixes: #2580 |
||||
--- |
||||
glib/gspawn.c | 35 ++++++++++++++++++++++++++--------- |
||||
1 file changed, 26 insertions(+), 9 deletions(-) |
||||
|
||||
diff --git a/glib/gspawn.c b/glib/gspawn.c |
||||
index c2fe306dc..9c2f7ba7b 100644 |
||||
--- a/glib/gspawn.c |
||||
+++ b/glib/gspawn.c |
||||
@@ -1457,8 +1457,10 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data) |
||||
} |
||||
|
||||
/* This function is called between fork() and exec() and hence must be |
||||
- * async-signal-safe (see signal-safety(7)). */ |
||||
-static void |
||||
+ * async-signal-safe (see signal-safety(7)). |
||||
+ * |
||||
+ * On failure, `-1` will be returned and errno will be set. */ |
||||
+static int |
||||
safe_closefrom (int lowfd) |
||||
{ |
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) |
||||
@@ -1472,6 +1474,7 @@ safe_closefrom (int lowfd) |
||||
* should be safe to use. |
||||
*/ |
||||
(void) closefrom (lowfd); |
||||
+ return 0; |
||||
#elif defined(__DragonFly__) |
||||
/* It is unclear whether closefrom function included in DragonFlyBSD libc_r |
||||
* is safe to use because it calls a lot of library functions. It is also |
||||
@@ -1479,12 +1482,13 @@ safe_closefrom (int lowfd) |
||||
* direct system call here ourselves to avoid possible issues. |
||||
*/ |
||||
(void) syscall (SYS_closefrom, lowfd); |
||||
+ return 0; |
||||
#elif defined(F_CLOSEM) |
||||
/* NetBSD and AIX have a special fcntl command which does the same thing as |
||||
* closefrom. NetBSD also includes closefrom function, which seems to be a |
||||
* simple wrapper of the fcntl command. |
||||
*/ |
||||
- (void) fcntl (lowfd, F_CLOSEM); |
||||
+ return fcntl (lowfd, F_CLOSEM); |
||||
#else |
||||
|
||||
#if defined(HAVE_CLOSE_RANGE) |
||||
@@ -1494,9 +1498,11 @@ safe_closefrom (int lowfd) |
||||
* |
||||
* Handle ENOSYS in case it’s supported in libc but not the kernel; if so, |
||||
* fall back to safe_fdwalk(). */ |
||||
- if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) |
||||
+ int ret = close_range (lowfd, G_MAXUINT, 0); |
||||
+ if (ret == 0 || errno != ENOSYS) |
||||
+ return ret; |
||||
#endif /* HAVE_CLOSE_RANGE */ |
||||
- (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); |
||||
+ return safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); |
||||
#endif |
||||
} |
||||
|
||||
@@ -1534,7 +1540,8 @@ enum |
||||
CHILD_EXEC_FAILED, |
||||
CHILD_OPEN_FAILED, |
||||
CHILD_DUP2_FAILED, |
||||
- CHILD_FORK_FAILED |
||||
+ CHILD_FORK_FAILED, |
||||
+ CHILD_CLOSE_FAILED, |
||||
}; |
||||
|
||||
/* This function is called between fork() and exec() and hence must be |
||||
@@ -1650,12 +1657,14 @@ do_exec (gint child_err_report_fd, |
||||
if (safe_dup2 (child_err_report_fd, 3) < 0) |
||||
write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); |
||||
set_cloexec (GINT_TO_POINTER (0), 3); |
||||
- safe_closefrom (4); |
||||
+ if (safe_closefrom (4) < 0) |
||||
+ write_err_and_exit (child_err_report_fd, CHILD_CLOSE_FAILED); |
||||
child_err_report_fd = 3; |
||||
} |
||||
else |
||||
{ |
||||
- safe_fdwalk (set_cloexec, GINT_TO_POINTER (3)); |
||||
+ if (safe_fdwalk (set_cloexec, GINT_TO_POINTER (3)) < 0) |
||||
+ write_err_and_exit (child_err_report_fd, CHILD_CLOSE_FAILED); |
||||
} |
||||
} |
||||
else |
||||
@@ -2446,7 +2455,15 @@ fork_exec (gboolean intermediate_child, |
||||
_("Failed to fork child process (%s)"), |
||||
g_strerror (buf[1])); |
||||
break; |
||||
- |
||||
+ |
||||
+ case CHILD_CLOSE_FAILED: |
||||
+ g_set_error (error, |
||||
+ G_SPAWN_ERROR, |
||||
+ G_SPAWN_ERROR_FAILED, |
||||
+ _("Failed to close file descriptor for child process (%s)"), |
||||
+ g_strerror (buf[1])); |
||||
+ break; |
||||
+ |
||||
default: |
||||
g_set_error (error, |
||||
G_SPAWN_ERROR, |
||||
-- |
||||
2.34.1 |
||||
|
@ -0,0 +1,985 @@
@@ -0,0 +1,985 @@
|
||||
Name: glib2 |
||||
Version: 2.68.4 |
||||
Release: 5%{?dist} |
||||
Summary: A library of handy utility functions |
||||
|
||||
License: LGPLv2+ |
||||
URL: http://www.gtk.org |
||||
Source0: http://download.gnome.org/sources/glib/2.68/glib-%{version}.tar.xz |
||||
|
||||
# Required for RHEL core crypto components policy. Good for Fedora too. |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260 |
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903 |
||||
Patch0: gnutls-hmac.patch |
||||
|
||||
# Add patches to move applications into systemd scopes in compliance with |
||||
# https://systemd.io/DESKTOP_ENVIRONMENTS/ |
||||
# Proposed upstream at https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596 |
||||
Patch1: 1596.patch |
||||
|
||||
# Add GPowerProfileMonitor |
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1965 |
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2194 |
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2222 |
||||
Patch2: 1965.patch |
||||
Patch3: 2194.patch |
||||
Patch4: 2222.patch |
||||
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2244 |
||||
Patch5: 2244.patch |
||||
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2291 |
||||
Patch6: 2291.patch |
||||
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1968 |
||||
Patch7: 1968.patch |
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2435 |
||||
Patch8: 2435.patch |
||||
|
||||
BuildRequires: chrpath |
||||
BuildRequires: gcc |
||||
BuildRequires: gcc-c++ |
||||
BuildRequires: gettext |
||||
BuildRequires: gtk-doc |
||||
BuildRequires: perl-interpreter |
||||
# for sys/inotify.h |
||||
BuildRequires: glibc-devel |
||||
BuildRequires: libattr-devel |
||||
BuildRequires: libselinux-devel |
||||
BuildRequires: meson |
||||
# for sys/sdt.h |
||||
BuildRequires: systemtap-sdt-devel |
||||
BuildRequires: pkgconfig(libelf) |
||||
BuildRequires: pkgconfig(libffi) |
||||
BuildRequires: pkgconfig(libpcre) |
||||
BuildRequires: pkgconfig(mount) |
||||
BuildRequires: pkgconfig(sysprof-capture-4) |
||||
BuildRequires: pkgconfig(zlib) |
||||
BuildRequires: python3-devel |
||||
|
||||
# For gnutls-hmac.patch. We now dlopen libgnutls.so.30 so that we can build a |
||||
# static glib2 without depending on a static build of GnuTLS as well. This will |
||||
# ensure we notice if the GnuTLS soname bumps, so that we can update our patch. |
||||
%if 0%{?__isa_bits} == 64 |
||||
Requires: libgnutls.so.30()(64bit) |
||||
%else |
||||
Requires: libgnutls.so.30 |
||||
%endif |
||||
|
||||
# Remove gamin dependency |
||||
Obsoletes: glib2-fam < 2.67.1-3 |
||||
|
||||
# glib 2.59.0 hash table changes broke older gcr versions / password prompts in gnome-shell |
||||
Conflicts: gcr < 3.28.1 |
||||
|
||||
Provides: bundled(gnulib) |
||||
Provides: bundled(gvdb) |
||||
Provides: bundled(libcharset) |
||||
Provides: bundled(xdgmime) |
||||
|
||||
%description |
||||
GLib is the low-level core library that forms the basis for projects |
||||
such as GTK+ and GNOME. It provides data structure handling for C, |
||||
portability wrappers, and interfaces for such runtime functionality |
||||
as an event loop, threads, dynamic loading, and an object system. |
||||
|
||||
|
||||
%package devel |
||||
Summary: A library of handy utility functions |
||||
Requires: %{name}%{?_isa} = %{version}-%{release} |
||||
|
||||
%description devel |
||||
The glib2-devel package includes the header files for the GLib library. |
||||
|
||||
%package doc |
||||
Summary: A library of handy utility functions |
||||
Requires: %{name} = %{version}-%{release} |
||||
BuildArch: noarch |
||||
|
||||
%description doc |
||||
The glib2-doc package includes documentation for the GLib library. |
||||
|
||||
%package static |
||||
Summary: glib static |
||||
Requires: %{name}-devel = %{version}-%{release} |
||||
|
||||
%description static |
||||
The %{name}-static subpackage contains static libraries for %{name}. |
||||
|
||||
%package tests |
||||
Summary: Tests for the glib2 package |
||||
Requires: %{name}%{?_isa} = %{version}-%{release} |
||||
|
||||
%description tests |
||||
The glib2-tests package contains tests that can be used to verify |
||||
the functionality of the installed glib2 package. |
||||
|
||||
%prep |
||||
%autosetup -n glib-%{version} -p1 |
||||
|
||||
%build |
||||
# Bug 1324770: Also explicitly remove PCRE sources since we use --with-pcre=system |
||||
rm glib/pcre/*.[ch] |
||||
|
||||
%meson \ |
||||
-Dman=true \ |
||||
-Ddtrace=true \ |
||||
-Dsystemtap=true \ |
||||
-Dsysprof=enabled \ |
||||
-Dglib_debug=disabled \ |
||||
-Dgtk_doc=true \ |
||||
-Dinstalled_tests=true \ |
||||
-Dgnutls=true \ |
||||
--default-library=both \ |
||||
%{nil} |
||||
|
||||
%meson_build |
||||
|
||||
%install |
||||
%meson_install |
||||
# Since this is a generated .py file, set it to a known timestamp for |
||||
# better reproducibility. |
||||
# Also copy the timestamp for other .py files, because meson doesn't |
||||
# do this, see https://github.com/mesonbuild/meson/issues/5027. |
||||
touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py |
||||
chrpath --delete %{buildroot}%{_libdir}/*.so |
||||
|
||||
# Perform byte compilation manually to avoid issues with |
||||
# irreproducibility of the default invalidation mode, see |
||||
# https://www.python.org/dev/peps/pep-0552/ and |
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1686078 |
||||
export PYTHONHASHSEED=0 |
||||
%py_byte_compile %{__python3} %{buildroot}%{_datadir} |
||||
|
||||
mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits} |
||||
sed -i -e "/^gio_querymodules=/s/gio-querymodules/gio-querymodules-%{__isa_bits}/" %{buildroot}%{_libdir}/pkgconfig/gio-2.0.pc |
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/gio/modules |
||||
touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache |
||||
|
||||
%find_lang glib20 |
||||
|
||||
%transfiletriggerin -- %{_libdir}/gio/modules |
||||
gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : |
||||
|
||||
%transfiletriggerpostun -- %{_libdir}/gio/modules |
||||
gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : |
||||
|
||||
%transfiletriggerin -- %{_datadir}/glib-2.0/schemas |
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : |
||||
|
||||
%transfiletriggerpostun -- %{_datadir}/glib-2.0/schemas |
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : |
||||
|
||||
%files -f glib20.lang |
||||
%license COPYING |
||||
%doc AUTHORS NEWS README |
||||
%{_libdir}/libglib-2.0.so.* |
||||
%{_libdir}/libgthread-2.0.so.* |
||||
%{_libdir}/libgmodule-2.0.so.* |
||||
%{_libdir}/libgobject-2.0.so.* |
||||
%{_libdir}/libgio-2.0.so.* |
||||
%dir %{_datadir}/bash-completion |
||||
%dir %{_datadir}/bash-completion/completions |
||||
%{_datadir}/bash-completion/completions/gapplication |
||||
%{_datadir}/bash-completion/completions/gdbus |
||||
%{_datadir}/bash-completion/completions/gio |
||||
%{_datadir}/bash-completion/completions/gsettings |
||||
%dir %{_datadir}/glib-2.0 |
||||
%dir %{_datadir}/glib-2.0/schemas |
||||
%dir %{_libdir}/gio |
||||
%dir %{_libdir}/gio/modules |
||||
%ghost %{_libdir}/gio/modules/giomodule.cache |
||||
%{_bindir}/gio |
||||
%{_bindir}/gio-querymodules* |
||||
%{_bindir}/glib-compile-schemas |
||||
%{_bindir}/gsettings |
||||
%{_bindir}/gdbus |
||||
%{_bindir}/gapplication |
||||
%{_mandir}/man1/gio.1* |
||||
%{_mandir}/man1/gio-querymodules.1* |
||||
%{_mandir}/man1/glib-compile-schemas.1* |
||||
%{_mandir}/man1/gsettings.1* |
||||
%{_mandir}/man1/gdbus.1* |
||||
%{_mandir}/man1/gapplication.1* |
||||
|
||||
%files devel |
||||
%{_libdir}/lib*.so |
||||
%{_libdir}/glib-2.0 |
||||
%{_includedir}/* |
||||
%{_datadir}/aclocal/* |
||||
%{_libdir}/pkgconfig/* |
||||
%{_datadir}/glib-2.0/gdb |
||||
%{_datadir}/glib-2.0/gettext |
||||
%{_datadir}/glib-2.0/schemas/gschema.dtd |
||||
%{_datadir}/glib-2.0/valgrind/glib.supp |
||||
%{_datadir}/bash-completion/completions/gresource |
||||
%{_bindir}/glib-genmarshal |
||||
%{_bindir}/glib-gettextize |
||||
%{_bindir}/glib-mkenums |
||||
%{_bindir}/gobject-query |
||||
%{_bindir}/gtester |
||||
%{_bindir}/gdbus-codegen |
||||
%{_bindir}/glib-compile-resources |
||||
%{_bindir}/gresource |
||||
%{_datadir}/glib-2.0/codegen |
||||
%attr (0755, root, root) %{_bindir}/gtester-report |
||||
%{_mandir}/man1/glib-genmarshal.1* |
||||
%{_mandir}/man1/glib-gettextize.1* |
||||
%{_mandir}/man1/glib-mkenums.1* |
||||
%{_mandir}/man1/gobject-query.1* |
||||
%{_mandir}/man1/gtester-report.1* |
||||
%{_mandir}/man1/gtester.1* |
||||
%{_mandir}/man1/gdbus-codegen.1* |
||||
%{_mandir}/man1/glib-compile-resources.1* |
||||
%{_mandir}/man1/gresource.1* |
||||
%{_datadir}/gdb/ |
||||
%{_datadir}/gettext/ |
||||
%{_datadir}/systemtap/ |
||||
|
||||
%files doc |
||||
%{_datadir}/gtk-doc/ |
||||
|
||||
%files static |
||||
%{_libdir}/libgio-2.0.a |
||||
%{_libdir}/libglib-2.0.a |
||||
%{_libdir}/libgmodule-2.0.a |
||||
%{_libdir}/libgobject-2.0.a |
||||
%{_libdir}/libgthread-2.0.a |
||||
|
||||
%files tests |
||||
%{_libexecdir}/installed-tests |
||||
%{_datadir}/installed-tests |
||||
|
||||
%changelog |
||||
* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.4-5 |
||||
- Add one more upstream patch to gspawn patchset |
||||
- Related: #1910092 |
||||
|
||||
* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.4-4 |
||||
- Add gspawn patchset |
||||
- Resolves: #1910092 |
||||
|
||||
* Wed Dec 01 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.4-3 |
||||
- Fix GNetworkMonitor after NetworkManager D-Bus API changes |
||||
- Resolves: #2014624 |
||||
|
||||
* Wed Sep 15 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.4-2 |
||||
- Fix g_get_user_database_entry() crash when used with nss-systemd |
||||
- Resolves: #2004711 |
||||
|
||||
* Sat Aug 21 2021 Kalev Lember <klember@redhat.com> - 2.68.4-1 |
||||
- Update to 2.68.4 |
||||
|
||||
* Wed Aug 18 2021 DJ Delorie <dj@redhat.com> - 2.68.3-6 |
||||
- Rebuilt for libffi 3.4.2 SONAME transition. |
||||
Related: rhbz#1891914 |
||||
|
||||
* Tue Aug 17 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-5 |
||||
- Backport GPowerProfileMonitor |
||||
- Resolves: #1994466 |
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.3-4 |
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags |
||||
Related: rhbz#1991688 |
||||
|
||||
* Tue Jul 27 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-3 |
||||
- Fix build with glibc 2.34 |
||||
- Resolves: #1984626 |
||||
|
||||
* Thu Jul 01 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-2 |
||||
- Refresh gnutls-hmac patchset to fix leaks in error path |
||||
- Related: #1971823 |
||||
|
||||
* Mon Jun 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-1 |
||||
- Update to 2.68.3 |
||||
- Resolves: #1976713 |
||||
- Remove Recommends: shared-mime-info |
||||
- Resolves: #1947897 |
||||
|
||||
* Wed Jun 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.2-2 |
||||
- Update GHmac patchset and reenable glib2-static |
||||
- Resolves: #1971823 |
||||
|
||||
* Wed May 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.2-1 |
||||
- Update to 2.68.2 |
||||
- Resolves: #1961039 |
||||
|
||||
* Tue May 11 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-4 |
||||
- No changes, bump revision to retry gating |
||||
- Related: #1951126 |
||||
|
||||
* Fri May 07 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-3 |
||||
- Add missing bundled provides |
||||
- Add rpminspect gating configuration |
||||
- Consolidate GDesktopAppInfo patchset |
||||
- Resolves: #1951126 |
||||
|
||||
* Wed Apr 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-2 |
||||
- Refresh GDesktopAppInfo patchset |
||||
- Related: #1951126 |
||||
|
||||
* Thu Apr 22 2021 Kalev Lember <klember@redhat.com> - 2.68.1-1 |
||||
- Update to 2.68.1 |
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.0-3 |
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 |
||||
|
||||
* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 2.68.0-2 |
||||
- Rebuild to fix sysprof-capture symbols leaking into libraries consuming it |
||||
|
||||
* Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 2.68.0-1 |
||||
- Update to 2.68.0 |
||||
|
||||
* Thu Mar 18 2021 Petr Pisar <ppisar@redhat.com> - 2.67.6-2 |
||||
- Disable debugging glib (bug #1936339) |
||||
|
||||
* Thu Mar 11 2021 Kalev Lember <klember@redhat.com> - 2.67.6-1 |
||||
- Update to 2.67.6 |
||||
|
||||
* Tue Mar 02 2021 Kalev Lember <klember@redhat.com> - 2.67.5-1 |
||||
- Update to 2.67.5 |
||||
|
||||
* Wed Feb 24 2021 Kalev Lember <klember@redhat.com> - 2.67.4-3 |
||||
- Enable sysprof capture support |
||||
|
||||
* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 2.67.4-2 |
||||
- Backport a fix for gsubprocesslauncher regression |
||||
|
||||
* Tue Feb 16 2021 Kalev Lember <klember@redhat.com> - 2.67.4-1 |
||||
- Update to 2.67.4 |
||||
|
||||
* Tue Feb 09 2021 Benjamin Berg <bberg@redhat.com> - 2.67.3-2 |
||||
- Add patches to move applications into systemd scopes |
||||
|
||||
* Thu Feb 04 2021 Kalev Lember <klember@redhat.com> - 2.67.3-1 |
||||
- Update to 2.67.3 |
||||
- Fix gtk-doc directory ownership |
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.67.1-4 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |
||||
|
||||
* Fri Jan 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.67.1-3 |
||||
- Drop dependency on gamin |
||||
|
||||
* Sat Dec 19 2020 Kevin Fenzi <kevin@scrye.com> - 2.67.1-2 |
||||
- Add already upstream patch to fix gdm crasher. |
||||
|
||||
* Sat Dec 19 2020 Kalev Lember <klember@redhat.com> - 2.67.1-1 |
||||
- Update to 2.67.1 |
||||
|
||||
* Fri Dec 04 2020 Ondrej Holy <oholy@redhat.com> - 2.67.0-7 |
||||
- Explicitly create modules dir to fix ELN build |
||||
|
||||
* Tue Dec 01 2020 Ondrej Holy and Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-6 |
||||
- Disable glib2-fam in RHEL |
||||
|
||||
* Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.67.0-5 |
||||
- Backport upstream patches to fix invalid use of volatile objects |
||||
(gcc 11 support) |
||||
|
||||
* Wed Nov 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-4 |
||||
- Make GnuTLS patch RHEL-specific, and make glib2-static subpackage Fedora-specific |
||||
|
||||
* Tue Nov 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-3 |
||||
- Use GnuTLS to implement GHmac (thanks to Colin Walters) |
||||
|
||||
* Wed Nov 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-2 |
||||
- Backport fix for GSocketClient crash |
||||
|
||||
* Thu Oct 29 2020 Kalev Lember <klember@redhat.com> - 2.67.0-1 |
||||
- Update to 2.67.0 |
||||
|
||||
* Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 2.66.2-1 |
||||
- Update to 2.66.2 |
||||
- Drop gtk-doc patch as we finally have a new enough gtk-doc |
||||
|
||||
* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-3 |
||||
- Fix yet another timezone bug |
||||
|
||||
* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-2 |
||||
- Fix timezone-related bugs in many applications caused by new glib timezone cache |
||||
|
||||
* Thu Oct 1 2020 Kalev Lember <klember@redhat.com> - 2.66.1-1 |
||||
- Update to 2.66.1 |
||||
|
||||
* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 2.66.0-1 |
||||
- Update to 2.66.0 |
||||
|
||||
* Wed Sep 02 2020 Kalev Lember <klember@redhat.com> - 2.65.3-1 |
||||
- Update to 2.65.3 |
||||
|
||||
* Tue Aug 25 2020 Adam Williamson <awilliam@redhat.com> - 2.65.2-3 |
||||
- Backport fix for GGO #2189 (error accessing some filesystems) |
||||
|
||||
* Thu Aug 20 2020 Jeff Law <law@redhat.com> - 2.65.2-2 |
||||
- Re-enable LTO |
||||
|
||||
* Tue Aug 18 2020 Kalev Lember <klember@redhat.com> - 2.65.2-1 |
||||
- Update to 2.65.2 |
||||
|
||||
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 2.65.1-1 |
||||
- Update to 2.65.1 |
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-5 |
||||
- Second attempt - Rebuilt for |
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-4 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild |
||||
|
||||
* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2.65.0-3 |
||||
Disable LTO |
||||
|
||||
* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-2 |
||||
- Update gio-2.0.pc with correct gio-querymodules name when renaming it |
||||
(#1849441) |
||||
|
||||
* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-1 |
||||
- Update to 2.65.0 |
||||
|
||||
* Wed May 20 2020 Kalev Lember <klember@redhat.com> - 2.64.3-1 |
||||
- Update to 2.64.3 |
||||
|
||||
* Tue Apr 28 2020 Tomas Popela <tpopela@redhat.com> - 2.64.2-2 |
||||
- Backport fix for a race condition in GCancellable (rhbz#1825230) |
||||
|
||||
* Fri Apr 10 2020 Kalev Lember <klember@redhat.com> - 2.64.2-1 |
||||
- Update to 2.64.2 |
||||
|
||||
* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 2.64.1-1 |
||||
- Update to 2.64.1 |
||||
|
||||
* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 2.64.0-1 |
||||
- Update to 2.64.0 |
||||
|
||||
* Mon Feb 24 2020 Kalev Lember <klember@redhat.com> - 2.63.6-1 |
||||
- Update to 2.63.6 |
||||
|
||||
* Wed Feb 12 2020 Kalev Lember <klember@redhat.com> - 2.63.5-3 |
||||
- Backport a patch to work around SELinux policies not allowing |
||||
SYS_sched_setattr (#1795524) |
||||
|
||||
* Fri Feb 07 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.63.5-2 |
||||
- Add patch for CVE-2020-6750 and related issues. |
||||
|
||||
* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 2.63.5-1 |
||||
- Update to 2.63.5 |
||||
|
||||
* Wed Jan 29 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.63.4-3 |
||||
- Fix GThreadPool initialization that is breaking createrepo_c (BZ #1795052) |
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.63.4-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild |
||||
|
||||
* Fri Jan 24 2020 Kalev Lember <klember@redhat.com> - 2.63.4-1 |
||||
- Update to 2.63.4 |
||||
|
||||
* Mon Dec 16 2019 Kalev Lember <klember@redhat.com> - 2.63.3-1 |
||||
- Update to 2.63.3 |
||||
|
||||
* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 2.63.2-1 |
||||
- Update to 2.63.2 |
||||
|
||||
* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.63.0-1 |
||||
- Update to 2.63.0 |
||||
|
||||
* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.62.1-1 |
||||
- Update to 2.62.1 |
||||
|
||||
* Fri Sep 06 2019 Kalev Lember <klember@redhat.com> - 2.62.0-1 |
||||
- Update to 2.62.0 |
||||
|
||||
* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 2.61.3-1 |
||||
- Update to 2.61.3 |
||||
|
||||
* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 2.61.2-1 |
||||
- Update to 2.61.2 |
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.61.1-3 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild |
||||
|
||||
* Tue Jun 11 2019 David King <amigadave@amigadave.com> - 2.61.1-2 |
||||
- Fix CVE-2019-12450 (#1719142) |
||||
- Consistently use buildroot macro |
||||
|
||||
* Fri May 24 2019 Kalev Lember <klember@redhat.com> - 2.61.1-1 |
||||
- Update to 2.61.1 |
||||
|
||||
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.61.0-2 |
||||
- Rebuild with Meson fix for #1699099 |
||||
|
||||
* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.61.0-1 |
||||
- Update to 2.61.0 |
||||
|
||||
* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.60.1-1 |
||||
- Update to 2.60.1 |
||||
|
||||
* Wed Mar 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-3 |
||||
- Switch back to timestamp-based pyc invalidation mode |
||||
|
||||
* Wed Mar 6 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-2 |
||||
- Make sure all .py files have fixed timestamps (fixes issue with |
||||
parallel installability of i686 and amd64 -devel packages) |
||||
- Switch to explicit byte compilation to override invalidation mode |
||||
|
||||
* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 2.60.0-1 |
||||
- Update to 2.60.0 |
||||
|
||||
* Mon Feb 18 2019 Kalev Lember <klember@redhat.com> - 2.59.3-1 |
||||
- Update to 2.59.3 |
||||
|
||||
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 2.59.2-1 |
||||
- Update to 2.59.2 |
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.59.1-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild |
||||
|
||||
* Sat Jan 26 2019 Kalev Lember <klember@redhat.com> - 2.59.1-1 |
||||
- Update to 2.59.1 |
||||
|
||||
* Thu Jan 03 2019 Kalev Lember <klember@redhat.com> - 2.59.0-1 |
||||
- Update to 2.59.0 |
||||
- Switch to the meson build system |
||||
|
||||
* Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 2.58.2-1 |
||||
- Update to 2.58.2 |
||||
|
||||
* Fri Oct 05 2018 Kalev Lember <klember@redhat.com> - 2.58.1-2 |
||||
- Fix multilib -devel installs (#1634778) |
||||
|
||||
* Fri Sep 21 2018 Kalev Lember <klember@redhat.com> - 2.58.1-1 |
||||
- Update to 2.58.1 |
||||
|
||||
* Wed Sep 05 2018 Kalev Lember <klember@redhat.com> - 2.58.0-1 |
||||
- Update to 2.58.0 |
||||
|
||||
* Thu Aug 2 2018 Ondrej Holy <oholy@redhat.com> - 2.57.2-1 |
||||
- Update to 2.57.2 |
||||
|
||||
* Fri Jul 20 2018 Ondrej Holy <oholy@redhat.com> - 2.57.1-1 |
||||
- Update to 2.57.1 |
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.1-6 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild |
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.56.1-5 |
||||
- Rebuilt for Python 3.7 |
||||
|
||||
* Thu Jun 14 2018 Debarshi Ray <rishi@fedoraproject.org> - 2.56.1-4 |
||||
- Backport patch to fix possible invalid pointer in dbus callback in the FD.o |
||||
notification backend (RH #1584916) |
||||
|
||||
* Sun May 27 2018 Kalev Lember <klember@redhat.com> - 2.56.1-3 |
||||
- Fix multilib -devel installs (#1581067) |
||||
|
||||
* Sun May 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.56.1-2 |
||||
- Include upstream patch to fix gdbus-codegen with meson 0.46. |
||||
|
||||
* Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 2.56.1-1 |
||||
- Update to 2.56.1 |
||||
|
||||
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 2.56.0-1 |
||||
- Update to 2.56.0 |
||||
|
||||
* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.2-3 |
||||
- Undo disabling mangling |
||||
|
||||
* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-2 |
||||
- Disable brp-mangle-shebangs shebangs |
||||
|
||||
* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-1 |
||||
- Update to 2.55.2 |
||||
- Drop ldconfig scriptlets |
||||
|
||||
* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.1-3 |
||||
- Switch to %%ldconfig_scriptlets |
||||
|
||||
* Thu Jan 18 2018 Kalev Lember <klember@redhat.com> - 2.55.1-2 |
||||
- gmain: Partial revert of recent wakeup changes |
||||
|
||||
* Mon Jan 08 2018 Kalev Lember <klember@redhat.com> - 2.55.1-1 |
||||
- Update to 2.55.1 |
||||
- Drop upstreamed systemtap multilib fix |
||||
|
||||
* Tue Dec 19 2017 Kalev Lember <klember@redhat.com> - 2.55.0-1 |
||||
- Update to 2.55.0 |
||||
|
||||
* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 2.54.2-1 |
||||
- Update to 2.54.2 |
||||
|
||||
* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 2.54.1-1 |
||||
- Update to 2.54.1 |
||||
|
||||
* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 2.54.0-1 |
||||
- Update to 2.54.0 |
||||
|
||||
* Tue Sep 05 2017 Kalev Lember <klember@redhat.com> - 2.53.7-1 |
||||
- Update to 2.53.7 |
||||
|
||||
* Sat Aug 19 2017 Kalev Lember <klember@redhat.com> - 2.53.6-1 |
||||
- Update to 2.53.6 |
||||
|
||||
* Mon Aug 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.53.5-1 |
||||
- Update to 2.53.5 |
||||
|
||||
* Tue Aug 01 2017 Kalev Lember <klember@redhat.com> - 2.53.4-4 |
||||
- Backport glib-mkenums flags annotation parsing fixes |
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.4-3 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild |
||||
|
||||
* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 2.53.4-2 |
||||
- Revert a GKeyFile introspection ABI change |
||||
|
||||
* Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 2.53.4-1 |
||||
- Update to 2.53.4 |
||||
|
||||
* Thu Jun 22 2017 Kalev Lember <klember@redhat.com> - 2.53.3-1 |
||||
- Update to 2.53.3 |
||||
|
||||
* Thu Jun 8 2017 Owen Taylor <otaylor@redhat.com> - 2.53.2-2 |
||||
- Make triggers also compile schemas in /app/share/glib-2.0/schemas |
||||
|
||||
* Wed May 24 2017 Florian Müllner <fmuellner@redhat.com> - 2.53.2-1 |
||||
- Update to 2.53.2 |
||||
|
||||
* Mon May 15 2017 Kalev Lember <klember@redhat.com> - 2.52.2-2 |
||||
- Backport a gmain GWakeup patch to fix timedatex high CPU usage (#1450628) |
||||
|
||||
* Tue May 09 2017 Kalev Lember <klember@redhat.com> - 2.52.2-1 |
||||
- Update to 2.52.2 |
||||
|
||||
* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-3 |
||||
- Backport patches for gmain wakeup for qemu |
||||
See: https://bugzilla.gnome.org/show_bug.cgi?id=761102 |
||||
|
||||
* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-2 |
||||
- Explictly remove PCRE sources |
||||
- Related: https://bugzilla.redhat.com/show_bug.cgi?id=1324770 |
||||
|
||||
* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 2.52.1-1 |
||||
- Update to 2.52.1 |
||||
|
||||
* Mon Mar 20 2017 Kalev Lember <klember@redhat.com> - 2.52.0-1 |
||||
- Update to 2.52.0 |
||||
|
||||
* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 2.51.5-1 |
||||
- Update to 2.51.5 |
||||
|
||||
* Thu Mar 02 2017 Kalev Lember <klember@redhat.com> - 2.51.4-2 |
||||
- Remove the dependency on dbus-launch again (#927212) |
||||
|
||||
* Wed Mar 01 2017 David King <amigadave@amigadave.com> - 2.51.4-1 |
||||
- Update to 2.51.4 |
||||
- Add a Requires on dbus-launch (#927212) |
||||
- Use pkgconfig for BuildRequires |
||||
|
||||
* Tue Feb 14 2017 Richard Hughes <rhughes@redhat.com> - 2.51.2-1 |
||||
- Update to 2.51.2 |
||||
|
||||
* Mon Feb 13 2017 Richard Hughes <rhughes@redhat.com> - 2.51.1-1 |
||||
- Update to 2.51.1 |
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.51.0-3 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild |
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.51.0-2 |
||||
- Rebuild for Python 3.6 |
||||
|
||||
* Sun Oct 30 2016 Kalev Lember <klember@redhat.com> - 2.51.0-1 |
||||
- Update to 2.51.0 |
||||
|
||||
* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 2.50.1-1 |
||||
- Update to 2.50.1 |
||||
|
||||
* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 2.50.0-1 |
||||
- Update to 2.50.0 |
||||
|
||||
* Tue Sep 13 2016 Kalev Lember <klember@redhat.com> - 2.49.7-1 |
||||
- Update to 2.49.7 |
||||
- Don't set group tags |
||||
|
||||
* Sun Aug 28 2016 Kalev Lember <klember@redhat.com> - 2.49.6-1 |
||||
- Update to 2.49.6 |
||||
|
||||
* Thu Aug 18 2016 Kalev Lember <klember@redhat.com> - 2.49.5-1 |
||||
- Update to 2.49.5 |
||||
- Own /usr/share/gdb and /usr/share/systemtap directories |
||||
|
||||
* Tue Aug 16 2016 Miro Hrončok <mhroncok@redhat.com> - 2.49.4-3 |
||||
- Use Python 3 for the RPM Python byte compilation |
||||
|
||||
* Wed Jul 27 2016 Ville Skyttä <ville.skytta@iki.fi> - 2.49.4-2 |
||||
- Switch to Python 3 (#1286284) |
||||
|
||||
* Thu Jul 21 2016 Kalev Lember <klember@redhat.com> - 2.49.4-1 |
||||
- Update to 2.49.4 |
||||
|
||||
* Sun Jul 17 2016 Kalev Lember <klember@redhat.com> - 2.49.3-1 |
||||
- Update to 2.49.3 |
||||
|
||||
* Wed Jun 22 2016 Richard Hughes <rhughes@redhat.com> - 2.49.2-1 |
||||
- Update to 2.49.2 |
||||
|
||||
* Wed Jun 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.49.1-2 |
||||
- Soften shared-mime-info dependency (#1266118) |
||||
|
||||
* Fri May 27 2016 Florian Müllner <fmuellner@redhat.com> - 2.49.1-1 |
||||
- Update to 2.49.1 |
||||
|
||||
* Tue May 10 2016 Kalev Lember <klember@redhat.com> - 2.48.1-1 |
||||
- Update to 2.48.1 |
||||
|
||||
* Wed Apr 06 2016 Colin Walters <walters@redhat.com> - 2.48.0-2 |
||||
- Explicitly require system pcre, though we happened to default to this now |
||||
anyways due to something else pulling PCRE into the buildroot |
||||
Closes rhbz#1287266 |
||||
|
||||
* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 2.48.0-1 |
||||
- Update to 2.48.0 |
||||
|
||||
* Thu Mar 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.92-1 |
||||
- Update to 2.47.92 |
||||
|
||||
* Wed Feb 24 2016 Colin Walters <walters@redhat.com> - 2.47.6.19.gad2092b-2 |
||||
- git snapshot to work around https://bugzilla.gnome.org/show_bug.cgi?id=762637 |
||||
- Add --with-python=/usr/bin/python explicitly to hopefully fix a weird |
||||
issue I am seeing where librepo fails to build in epel7 with this due to |
||||
us requiring /bin/python. |
||||
|
||||
* Wed Feb 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.6-1 |
||||
- Update to 2.47.6 |
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.47.5-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild |
||||
|
||||
* Tue Jan 19 2016 David King <amigadave@amigadave.com> - 2.47.5-1 |
||||
- Update to 2.47.5 |
||||
|
||||
* Wed Dec 16 2015 Kalev Lember <klember@redhat.com> - 2.47.4-1 |
||||
- Update to 2.47.4 |
||||
|
||||
* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.3-1 |
||||
- Update to 2.47.3 |
||||
|
||||
* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.2-1 |
||||
- Update to 2.47.2 |
||||
|
||||
* Mon Nov 09 2015 Kevin Fenzi <kevin@scrye.com> - 2.47.1-2 |
||||
- Add full path redirect output to null and || : to triggers. |
||||
|
||||
* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 2.47.1-1 |
||||
- Update to 2.47.1 |
||||
|
||||
* Mon Oct 19 2015 Kalev Lember <klember@redhat.com> - 2.46.1-2 |
||||
- Backport an upstream fix for app launching under wayland (#1273146) |
||||
|
||||
* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 2.46.1-1 |
||||
- Update to 2.46.1 |
||||
|
||||
* Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 2.46.0-1 |
||||
- Update to 2.46.0 |
||||
|
||||
* Mon Sep 14 2015 Kalev Lember <klember@redhat.com> - 2.45.8-1 |
||||
- Update to 2.45.8 |
||||
|
||||
* Tue Sep 01 2015 Kalev Lember <klember@redhat.com> - 2.45.7-1 |
||||
- Update to 2.45.7 |
||||
|
||||
* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.6-1 |
||||
- Update to 2.45.6 |
||||
|
||||
* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.5-1 |
||||
- Update to 2.45.5 |
||||
|
||||
* Fri Aug 14 2015 Matthias Clasen <mclasen@redhat.com> - 2.45.4-2 |
||||
- Add file triggers for gio modules and gsettings schemas |
||||
|
||||
* Tue Jul 21 2015 David King <amigadave@amigadave.com> - 2.45.4-1 |
||||
- Update to 2.45.4 |
||||
|
||||
* Wed Jun 24 2015 Kalev Lember <klember@redhat.com> - 2.45.3-2 |
||||
- Backport a patch to fix notification withdrawing in gnome-software |
||||
|
||||
* Wed Jun 24 2015 David King <amigadave@amigadave.com> - 2.45.3-1 |
||||
- Update to 2.45.3 |
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.45.2-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |
||||
|
||||
* Tue May 26 2015 David King <amigadave@amigadave.com> - 2.45.2-1 |
||||
- Update to 2.45.2 |
||||
|
||||
* Thu Apr 30 2015 Kalev Lember <kalevlember@gmail.com> - 2.45.1-1 |
||||
- Update to 2.45.1 |
||||
|
||||
* Mon Mar 23 2015 Kalev Lember <kalevlember@gmail.com> - 2.44.0-1 |
||||
- Update to 2.44.0 |
||||
|
||||
* Tue Mar 17 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.92-1 |
||||
- Update to 2.43.92 |
||||
|
||||
* Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.91-1 |
||||
- Update to 2.43.91 |
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.43.90-2 |
||||
- Rebuilt for Fedora 23 Change |
||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code |
||||
|
||||
* Wed Feb 18 2015 David King <amigadave@amigadave.com> - 2.43.90-1 |
||||
- Update to 2.43.90 |
||||
- Update man pages glob in files section |
||||
|
||||
* Tue Feb 10 2015 Matthias Clasen <mclasen@redhat.com> - 2.43.4-1 |
||||
- Update to 2.43.4 |
||||
|
||||
* Tue Jan 20 2015 David King <amigadave@amigadave.com> - 2.43.3-1 |
||||
- Update to 2.43.3 |
||||
|
||||
* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.2-1 |
||||
- Update to 2.43.2 |
||||
|
||||
* Tue Nov 25 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.1-1 |
||||
- Update to 2.43.1 |
||||
|
||||
* Thu Oct 30 2014 Florian Müllner <fmuellner@redhat.com> - 2.43.0-1 |
||||
- Update to 2.43.0 |
||||
|
||||
* Mon Sep 22 2014 Kalev Lember <kalevlember@gmail.com> - 2.42.0-1 |
||||
- Update to 2.42.0 |
||||
|
||||
* Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.5-1 |
||||
- Update to 2.41.5 |
||||
|
||||
* Thu Sep 4 2014 Matthias Clasen <mclasen@redhat.com> 2.41.4-3 |
||||
- Don't remove rpath from gdbus-peer test - it doesn't work without it |
||||
|
||||
* Thu Sep 04 2014 Bastien Nocera <bnocera@redhat.com> 2.41.4-2 |
||||
- Fix banshee getting selected as the default movie player |
||||
|
||||
* Tue Sep 02 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.4-1 |
||||
- Update to 2.41.4 |
||||
|
||||
* Sat Aug 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.3-1 |
||||
- Update to 2.41.3 |
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.2-3 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild |
||||
|
||||
* Wed Jul 23 2014 Stef Walter <stefw@redhat.com> - 2.41.2-2 |
||||
- Fix regression with GDBus array encoding rhbz#1122128 |
||||
|
||||
* Mon Jul 14 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.2-1 |
||||
- Update to 2.41.2 |
||||
|
||||
* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 2.41.1-2 |
||||
- fix license handling |
||||
|
||||
* Tue Jun 24 2014 Richard Hughes <rhughes@redhat.com> - 2.41.1-1 |
||||
- Update to 2.41.1 |
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.0-2 |
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild |
||||
|
||||
* Tue May 27 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.0-1 |
||||
- Update to 2.41.0 |
||||
|
||||
* Mon Mar 24 2014 Richard Hughes <rhughes@redhat.com> - 2.40.0-1 |
||||
- Update to 2.40.0 |
||||
|
||||
* Tue Mar 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.92-1 |
||||
- Update to 2.39.92 |
||||
|
||||
* Tue Mar 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.91-1 |
||||
- Update to 2.39.91 |
||||
|
||||
* Tue Feb 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.90-1 |
||||
- Update to 2.39.90 |
||||
|
||||
* Tue Feb 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.4-1 |
||||
- Update to 2.39.4 |
||||
|
||||
* Tue Jan 14 2014 Richard Hughes <rhughes@redhat.com> - 2.39.3-1 |
||||
- Update to 2.39.3 |
||||
|
||||
* Sun Dec 22 2013 Richard W.M. Jones <rjones@redhat.com> - 2.39.2-2 |
||||
- Re-add static subpackage so that we can build static qemu as |
||||
an AArch64 binfmt. |
||||
|
||||
* Tue Dec 17 2013 Richard Hughes <rhughes@redhat.com> - 2.39.2-1 |
||||
- Update to 2.39.2 |
||||
|
||||
* Mon Dec 09 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-2 |
||||
- Backport a patch from master to stop gnome-settings-daemon crashing. |
||||
|
||||
* Thu Nov 14 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-1 |
||||
- Update to 2.39.1 |
||||
|
||||
* Mon Oct 28 2013 Richard Hughes <rhughes@redhat.com> - 2.39.0-1 |
||||
- Update to 2.39.0 |
||||
|
||||
* Tue Sep 24 2013 Kalev Lember <kalevlember@gmail.com> - 2.38.0-1 |
||||
- Update to 2.38.0 |
||||
|
||||
* Tue Sep 17 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.93-1 |
||||
- Update to 2.37.93 |
||||
|
||||
* Mon Sep 02 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.7-1 |
||||
- Update to 2.37.7 |
||||
|
||||
* Wed Aug 21 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.6-1 |
||||
- Update to 2.37.6 |
||||
|
||||
* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 2.37.5-2 |
||||
- Perl 5.18 rebuild |
||||
|
||||
* Thu Aug 1 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.5-1 |
||||
- Update to 2.37.5 |
||||
|
||||
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.37.4-2 |
||||
- Perl 5.18 rebuild |
||||
|
||||
* Tue Jul 9 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.4-1 |
||||
- Update to 2.37.4 |
||||
|
||||
* Thu Jun 20 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.2-1 |
||||
- Update to 2.37.2 |
||||
|
||||
* Tue May 28 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.1-1 |
||||
- Update to 2.37.1 |
||||
- Add a tests subpackage |
||||
|
||||
* Sat May 04 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.0-1 |
||||
- Update to 2.37.0 |
||||
|
||||
* Sat Apr 27 2013 Thorsten Leemhuis <fedora@leemhuis.info> - 2.36.1-2 |
||||
- Fix pidgin freezes by applying patch from master (#956872) |
||||
|
||||
* Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.1-1 |
||||
- Update to 2.36.1 |
||||
|
||||
* Mon Mar 25 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.0-1 |
||||
- Update to 2.36.0 |
||||
|
||||
* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.9-1 |
||||
- Update to 2.35.9 |
||||
|
||||
* Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.8-1 |
||||
- Update to 2.35.8 |
||||
|
||||
* Tue Feb 05 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.7-1 |
||||
- Update to 2.35.7 |
||||
|
||||
* Tue Jan 15 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.4-1 |
||||
- Update to 2.35.4 |
||||
|
||||
* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.3-1 |
||||
- Update to 2.35.3 |
||||
|
||||
* Sat Nov 24 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.2-1 |
||||
- Update to 2.35.2 |
||||
|
||||
* Thu Nov 08 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.1-1 |
||||
- Update to 2.35.1 |
||||
- Drop upstreamed codegen-in-datadir.patch |
Loading…
Reference in new issue