Fri Feb 24 23:15:21 UTC 2012

1 files changed, 38 insertions, 0 deletions

diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch
new file mode 100644
index 000000000..b956cb9f6
--- /dev/null
+++ b/extra/colord/fix-compilation.patch
@@ -0,0 +1,38 @@
+From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 23 Feb 2012 10:43:37 +0000
+Subject: [PATCH] trivial: Fix compile with older versions of GLib
+
+g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the
+docs suggested.
+
+Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481
+---
+ src/cd-profile.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/src/cd-profile.c b/src/cd-profile.c
+index a292616..323588b 100644
+--- a/src/cd-profile.c
++++ b/src/cd-profile.c
+@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile,
+ 	}
+ 
+ 	/* create a mapped file */
++#if GLIB_CHECK_VERSION(2,31,0)
+ 	priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error);
++	if (priv->mapped_file == NULL) {
++		g_set_error (error,
++			     CD_MAIN_ERROR,
++			     CD_MAIN_ERROR_FAILED,
++			     "failed to create mapped file from fd %i",
++			     fd);
++		goto out;
++	}
++#endif
+ 
+ 	/* parse the ICC file */
+ 	lcms_profile = cmsOpenProfileFromStream (stream, "r");
+-- 
+1.7.6
+