Update to colord-1.2.1.

This commit is contained in:
ajacoutot 2014-06-04 13:37:20 +00:00
parent c66a2ff20e
commit 053ad0c3ae
6 changed files with 18 additions and 50 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2014/05/19 17:36:28 landry Exp $
# $OpenBSD: Makefile,v 1.38 2014/06/04 13:37:20 ajacoutot Exp $
COMMENT= device color profile management daemon
BROKEN-hppa= SIGBUS in cd-create-profile during build
V= 1.2.0
V= 1.2.1
DISTNAME= colord-${V}
EXTRACT_SUFX= .tar.xz
REVISION= 0
SHARED_LIBS += colordprivate 1.0 # 2.1
SHARED_LIBS += colord 1.0 # 2.1

View File

@ -1,2 +1,2 @@
SHA256 (colord-1.2.0.tar.xz) = 3sutB/fb3rq+VS8ygFggCFEfRiAbR+CpHqJm1UByFV4=
SIZE (colord-1.2.0.tar.xz) = 1155920
SHA256 (colord-1.2.1.tar.xz) = LbjHAC98hZ3OcamI3nw5+DcKarmaYrEDdIggi0OCm+o=
SIZE (colord-1.2.1.tar.xz) = 1164544

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.17 2014/04/11 10:48:17 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.18 2014/06/04 13:37:20 ajacoutot Exp $
/var/lib -> /var/db
--- configure.orig Fri Feb 28 19:44:15 2014
+++ configure Fri Apr 11 11:42:01 2014
@@ -18237,7 +18237,7 @@ fi
--- configure.orig Fri May 23 12:46:43 2014
+++ configure Wed Jun 4 15:17:19 2014
@@ -18305,7 +18305,7 @@ fi
# per-machine directory

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-lib_colord_cd-it8_c,v 1.1 2014/04/18 08:22:21 ajacoutot Exp $
commit 919eda53dad3d635aa4b815c923bcd33f3258d3f
Author: Richard Hughes <richard@hughsie.com>
Date: Thu Apr 17 13:28:48 2014 +0100
Fix building the CMF spectra on OpenBSD/sparc64
--- lib/colord/cd-it8.c.orig Fri Feb 28 19:44:03 2014
+++ lib/colord/cd-it8.c Fri Apr 18 10:20:54 2014
@@ -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 */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.10 2014/04/11 10:48:17 ajacoutot Exp $
--- src/Makefile.in.orig Fri Feb 28 19:44:14 2014
+++ src/Makefile.in Fri Apr 11 11:42:01 2014
@@ -1785,11 +1785,6 @@ cd-resources.h: colord.gresource.xml
$OpenBSD: patch-src_Makefile_in,v 1.11 2014/06/04 13:37:20 ajacoutot Exp $
--- src/Makefile.in.orig Fri May 23 12:46:47 2014
+++ src/Makefile.in Wed Jun 4 15:17:19 2014
@@ -1822,11 +1822,6 @@ cd-resources.h: colord.gresource.xml
$(srcdir)/colord.gresource.xml
install-data-hook:

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_cd-main_c,v 1.12 2014/04/11 10:48:17 ajacoutot Exp $
$OpenBSD: patch-src_cd-main_c,v 1.13 2014/06/04 13:37:20 ajacoutot Exp $
/var/lib -> /var/db
--- src/cd-main.c.orig Tue Dec 10 15:45:02 2013
+++ src/cd-main.c Fri Apr 11 11:49:37 2014
@@ -1788,8 +1788,8 @@ cd_main_icc_store_added_cb (CdIccStore *icc_store,
--- src/cd-main.c.orig Wed May 21 11:09:37 2014
+++ src/cd-main.c Wed Jun 4 15:17:19 2014
@@ -1791,8 +1791,8 @@ cd_main_icc_store_added_cb (CdIccStore *icc_store,
/* create profile */
profile = cd_profile_new ();
filename = cd_icc_get_filename (icc);
@ -15,7 +15,7 @@ $OpenBSD: patch-src_cd-main_c,v 1.12 2014/04/11 10:48:17 ajacoutot Exp $
cd_profile_set_is_system_wide (profile, TRUE);
/* parse the profile name */
@@ -2721,7 +2721,7 @@ main (int argc, char *argv[])
@@ -2725,7 +2725,7 @@ main (int argc, char *argv[])
/* connect to the mapping db */
priv->mapping_db = cd_mapping_db_new ();
ret = cd_mapping_db_load (priv->mapping_db,
@ -24,7 +24,7 @@ $OpenBSD: patch-src_cd-main_c,v 1.12 2014/04/11 10:48:17 ajacoutot Exp $
&error);
if (!ret) {
g_warning ("CdMain: failed to load mapping database: %s",
@@ -2733,7 +2733,7 @@ main (int argc, char *argv[])
@@ -2737,7 +2737,7 @@ main (int argc, char *argv[])
/* connect to the device db */
priv->device_db = cd_device_db_new ();
ret = cd_device_db_load (priv->device_db,