From d89e2a93fd463e0ad46ecf3271012e47b78c4906 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 27 Oct 2014 17:17:21 +0000
Subject: [PATCH] Backport a patch to fix calibration using the helper

---
 ...ix-a-crash-in-the-session-helper-whi.patch | 48 +++++++++++++++++++
 colord.spec                                   | 10 +++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0001-session-helper-Fix-a-crash-in-the-session-helper-whi.patch

diff --git a/0001-session-helper-Fix-a-crash-in-the-session-helper-whi.patch b/0001-session-helper-Fix-a-crash-in-the-session-helper-whi.patch
new file mode 100644
index 0000000..1f164ac
--- /dev/null
+++ b/0001-session-helper-Fix-a-crash-in-the-session-helper-whi.patch
@@ -0,0 +1,48 @@
+From da60b2f4578a81e4a99bc47a4f146a61cd8aef81 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 27 Oct 2014 16:51:20 +0000
+Subject: [PATCH] session-helper: Fix a crash in the session helper while
+ calibrating
+
+---
+ contrib/session-helper/cd-main.c  | 2 +-
+ contrib/session-helper/cd-state.c | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
+index 5cd81d9..5b44305 100644
+--- a/contrib/session-helper/cd-main.c
++++ b/contrib/session-helper/cd-main.c
+@@ -1361,7 +1361,7 @@ cd_main_start_calibration (CdMainPrivate *priv,
+ 							   CD_SESSION_INTERACTION_MOVE_TO_SURFACE);
+ 			return TRUE;
+ 		}
+-		g_propagate_error (error, error_local);
++		*error = g_error_copy (error_local);
+ 		return FALSE;
+ 	}
+ 
+diff --git a/contrib/session-helper/cd-state.c b/contrib/session-helper/cd-state.c
+index 0ff68e6..e0b2a06 100644
+--- a/contrib/session-helper/cd-state.c
++++ b/contrib/session-helper/cd-state.c
+@@ -470,7 +470,7 @@ cd_state_show_profile (CdState *state)
+ 	gdouble total_time = 0.0f;
+ 	guint i;
+ 	guint uncumalitive = 0;
+-	_cleanup_string_free_ GString *result;
++	_cleanup_string_free_ GString *result = NULL;
+ 
+ 	/* get the total time so we can work out the divisor */
+ 	for (i = 0; i < state->priv->steps; i++)
+@@ -492,7 +492,6 @@ cd_state_show_profile (CdState *state)
+ 					state->priv->step_profile[i] / division);
+ 	}
+ 	g_printerr ("\n\n%s-1 ] at %s\n\n", result->str, state->priv->id);
+-	g_string_free (result, TRUE);
+ }
+ 
+ /**
+-- 
+2.1.0
+
diff --git a/colord.spec b/colord.spec
index 4c48b3d..7cc107c 100644
--- a/colord.spec
+++ b/colord.spec
@@ -19,11 +19,14 @@
 Summary:   Color daemon
 Name:      colord
 Version:   1.2.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 
+# already upstream
+Patch0:    0001-session-helper-Fix-a-crash-in-the-session-helper-whi.patch
+
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -107,6 +110,7 @@ This may be useful for CMYK soft-proofing or for extra device support.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-session-helper
 
 %build
 # Set ~2 GiB limit so that colprof is forced to work in chunks when
@@ -280,6 +284,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Mon Oct 27 2014 Richard Hughes <richard@hughsie.com> 1.2.4-2
+- Backport a patch to fix calibration using the helper
+- Resolves: #1157279
+
 * Sun Sep 12 2014 Richard Hughes <richard@hughsie.com> 1.2.4-1
 - New upstream version
 - Don't enable PIE support when --without-pic is specified