Hello community,

here is the log from the commit of package colord for openSUSE:Factory checked 
in at 2014-06-16 21:43:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/colord (Old)
 and      /work/SRC/openSUSE:Factory/.colord.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "colord"

Changes:
--------
--- /work/SRC/openSUSE:Factory/colord/colord.changes    2014-05-05 
21:14:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.colord.new/colord.changes       2014-06-16 
21:43:54.000000000 +0200
@@ -1,0 +2,5 @@
+Sun May 18 22:16:01 UTC 2014 - sch...@linux-m68k.org
+
+- type-mismatch.patch: fix type mismatch (fdo#77535)
+
+-------------------------------------------------------------------

New:
----
  type-mismatch.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ colord.spec ++++++
--- /var/tmp/diff_new_pack.bZ4RLE/_old  2014-06-16 21:43:55.000000000 +0200
+++ /var/tmp/diff_new_pack.bZ4RLE/_new  2014-06-16 21:43:55.000000000 +0200
@@ -29,6 +29,8 @@
 # Apparmor profile
 Source1:        usr.lib.colord
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM type-mismatch.patch fdo#77535 sch...@linux-m68k.org -- 
Fix type mismatch on build 
+Patch0:         type-mismatch.patch
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  vala
@@ -118,6 +120,7 @@
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \

++++++ type-mismatch.patch ++++++
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 */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to