* [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon/files: gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch gnome-settings-daemon-3.2.1-optional-colord.patch gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
@ 2011-10-29 2:11 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2011-10-29 2:11 UTC (permalink / raw
To: gentoo-commits
tetromino 11/10/29 02:11:42
Added:
gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
gnome-settings-daemon-3.2.1-optional-colord.patch
gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
Log:
Bump to 3.2.1 from the gnome overlay. Numerous changes and improvements.
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Revision Changes Path
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
===================================================================
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
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.2.1-optional-colord.patch
===================================================================
From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Thu, 27 Oct 2011 23:30:41 -0400
Subject: [PATCH] Make colord optional
---
configure.ac | 20 +++++++++++++++++++-
data/Makefile.am | 7 ++++++-
plugins/Makefile.am | 7 ++++++-
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index fe74674..f1a8547 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
dnl ---------------------------------------------------------------------------
dnl - Check for colord
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
+build_color=false
+AC_ARG_ENABLE(color,
+ AC_HELP_STRING([--disable-color],
+ [turn off color plugin]),
+ [case "${enableval}" in
+ yes) WANT_COLOR=yes ;;
+ no) WANT_COLOR=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
+ esac],
+ [WANT_COLOR=yes]) dnl Default value
+
+if test x$WANT_COLOR = xyes; then
+ PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
+ build_color=true
+fi
+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
+
+AC_SUBST(COLORD_CFLAGS)
+AC_SUBST(COLORD_LIBS)
dnl ---------------------------------------------------------------------------
dnl - Check for libcanberra
diff --git a/data/Makefile.am b/data/Makefile.am
index 43ba27c..1f3bbef 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,6 @@ gsettings_SCHEMAS = \
org.gnome.settings-daemon.plugins.gschema.xml \
org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
org.gnome.settings-daemon.plugins.power.gschema.xml \
- org.gnome.settings-daemon.plugins.color.gschema.xml \
org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
@@ -21,6 +20,12 @@ gsettings_SCHEMAS = \
all_schemas = $(gsettings_SCHEMAS)
+if BUILD_COLOR
+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
+else
+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
+endif
+
if HAVE_PACKAGEKIT
gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
else
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 5e26811..d2404ab 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -6,7 +6,6 @@ enabled_plugins = \
automount \
background \
clipboard \
- color \
cursor \
datetime \
dummy \
@@ -24,6 +23,12 @@ enabled_plugins = \
disabled_plugins = $(NULL)
+if BUILD_COLOR
+enabled_plugins += color
+else
+disabled_plugins += color
+endif
+
if BUILD_GCONF_BRIDGE
enabled_plugins += gconf
else
--
1.7.7.1
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch?rev=1.1&content-type=text/plain
Index: gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
===================================================================
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-29 2:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-29 2:11 [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon/files: gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch gnome-settings-daemon-3.2.1-optional-colord.patch gnome-settings-daemon-3.2.1-WEXITSTATUS.patch Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox