pool/colord
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 235901 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/235901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=49
This commit is contained in:
Stephan Kulow 2014-06-16 19:43:19 +00:00 committed by Git OBS Bridge
commit 7e3492008b
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
colord.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 18 22:16:01 UTC 2014 - schwab@linux-m68k.org
- type-mismatch.patch: fix type mismatch (fdo#77535)
-------------------------------------------------------------------
Mon Apr 7 17:50:42 UTC 2014 - zaitor@opensuse.org

3
colord.spec
View File

@ -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 type-mismatch.patch fdo#77535 schwab@linux-m68k.org -- Fix type mismatch on build
Patch0: 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
%patch0 -p1
%build
%configure \

26
type-mismatch.patch Normal file
View File

@ -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 */