diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-10-29 15:54:07 -0400 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-10-29 15:54:07 -0400 |
| commit | 6de2125684379e4611fc972e9ea671e48e4f5685 (patch) | |
| tree | 9cbee0e9f899ed19d9d7f125ed9f0e17ce33c2ea /gnome-base/gnome-settings-daemon/files | |
| parent | gnome-base/gnome-menus: moved to gx86 (diff) | |
| download | gnome-6de2125684379e4611fc972e9ea671e48e4f5685.tar.gz gnome-6de2125684379e4611fc972e9ea671e48e4f5685.tar.bz2 gnome-6de2125684379e4611fc972e9ea671e48e4f5685.zip | |
gnome-base/gnome-settings-daemon: moved 3.2.1 to gx86 + qa
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
2 files changed, 0 insertions, 62 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch deleted file mode 100644 index 370cfc5e..00000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e46d34f5bd9b0260a204d5f8a9d23c747b61923f Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Mon, 3 Oct 2011 10:02:34 -0400 -Subject: [PATCH] color: unbreak loading profiles at startup - -A recent commit broke color profile loading at startup if the profile -directory exists already. Fix this. - -https://bugzilla.gnome.org/show_bug.cgi?id=660790 - -Signed-off-by: Richard Hughes <richard@hughsie.com> - -[Alexandre Rostovtsev <tetromino@gmail.com>: backported to 3.2] ---- - plugins/color/gcm-profile-store.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c -index 3dde406..f8b0889 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -445,13 +445,14 @@ gcm_profile_store_search (GcmProfileStore *profile_store) - /* get Linux per-user profiles */ - path = g_build_filename (g_get_user_data_dir (), "icc", NULL); - ret = gcm_profile_store_mkdir_with_parents (path, &error); -- if (!ret) { -+ if (!ret && -+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - g_warning ("failed to create directory on startup: %s", error->message); -- g_error_free (error); - } else { - gcm_profile_store_search_path (profile_store, path, 0); - } - g_free (path); -+ g_clear_error (&error); - - /* get per-user profiles from obsolete location */ - path = g_build_filename (g_get_home_dir (), ".color", "icc", NULL); --- -1.7.7 - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch deleted file mode 100644 index 2c3e59f6..00000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9b141728c889a6d2f88767655661318e3d8d82da Mon Sep 17 00:00:00 2001 -From: Malcolm Lewis <malcolmlewis@opensuse.org> -Date: Mon, 17 Oct 2011 16:43:06 +0000 -Subject: power: Fix "undefined symbol: WEXITSTATUS" error. - -https://bugzilla.gnome.org/show_bug.cgi?id=662020 ---- -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 010d14a..3f10c22 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -24,6 +24,7 @@ - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -+#include <sys/wait.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <libupower-glib/upower.h> --- -cgit v0.9.0.2 |