From b13e5ca3a90dd21c5f7e84372080c48aa682002c3b35bd794cc0acdc38f96154 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Fri, 30 May 2014 20:27:09 +0000
Subject: [PATCH] Accepting request 235858 from home:AndreasSchwab:f

- type-mismatch.patch: fix type mismatch (bfo#77535)

OBS-URL: https://build.opensuse.org/request/show/235858
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=98
---
 colord.changes      |  5 +++++
 colord.spec         |  3 +++
 type-mismatch.patch | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 type-mismatch.patch

diff --git a/colord.changes b/colord.changes
index c898cdd..0d949b8 100644
--- a/colord.changes
+++ b/colord.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 18 22:16:01 UTC 2014 - schwab@linux-m68k.org
+
+- type-mismatch.patch: fix type mismatch (bfo#77535)
+
 -------------------------------------------------------------------
 Mon Apr  7 17:50:42 UTC 2014 - zaitor@opensuse.org
 
diff --git a/colord.spec b/colord.spec
index 112374e..ef7951a 100644
--- a/colord.spec
+++ b/colord.spec
@@ -29,6 +29,8 @@ Source0:        http://www.freedesktop.org/software/colord/releases/%{name}-%{ve
 # Apparmor profile
 Source1:        usr.lib.colord
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM fix type mismatch (bfo#77535)
+Patch:          type-mismatch.patch
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  vala
@@ -118,6 +120,7 @@ there are no users logged in.
 %lang_package
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure \
diff --git a/type-mismatch.patch b/type-mismatch.patch
new file mode 100644
index 0000000..c66a1eb
--- /dev/null
+++ b/type-mismatch.patch
@@ -0,0 +1,26 @@
+Index: colord-1.2.0/lib/colord/cd-it8.c
+===================================================================
+--- colord-1.2.0.orig/lib/colord/cd-it8.c
++++ colord-1.2.0/lib/colord/cd-it8.c
+@@ -1424,7 +1424,7 @@ cd_it8_save_to_data (CdIt8 *it8,
+ 	gchar *data_tmp = NULL;
+ 	gchar *date_str = NULL;
+ 	GDateTime *datetime = NULL;
+-	gsize size_tmp = 0;
++	cmsUInt32Number size_tmp = 0;
+ 	guint i;
+ 
+ 	g_return_val_if_fail (CD_IS_IT8 (it8), FALSE);
+@@ -1494,10 +1494,10 @@ cd_it8_save_to_data (CdIt8 *it8,
+ 	}
+ 
+ 	/* write the file */
+-	ret = cmsIT8SaveToMem (it8_lcms, NULL, (cmsUInt32Number *) &size_tmp);
++	ret = cmsIT8SaveToMem (it8_lcms, NULL, &size_tmp);
+ 	g_assert (ret);
+ 	data_tmp = g_malloc (size_tmp);
+-	ret = cmsIT8SaveToMem (it8_lcms, data_tmp, (cmsUInt32Number *) &size_tmp);
++	ret = cmsIT8SaveToMem (it8_lcms, data_tmp, &size_tmp);
+ 	g_assert (ret);
+ 
+ 	/* save for caller */