These are patches cherry-picked from upstream - gitorious.org:colord/master.git
They are applied inline, rather than as separate patches, so that they
automatically go away once the upstream release containing them is merged in.
--- colord-1.0.6.orig/client/cd-create-profile.c
+++ colord-1.0.6/client/cd-create-profile.c
@@ -882,7 +882,6 @@ main (int argc, char **argv)
 	};
 
 	setlocale (LC_ALL, "");
-	g_type_init ();
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--- colord-1.0.6.orig/client/cd-find-broken.c
+++ colord-1.0.6/client/cd-find-broken.c
@@ -180,8 +180,6 @@ main (int argc, char *argv[])
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
-
 	/* create CSV headers */
 	priv = g_new0 (CdFindBrokenPriv, 1);
 	priv->csv_all = g_string_new ("filename,vendor,model,serial,data_source,version,cmf_binary,cmf_version\n");
--- colord-1.0.6.orig/client/cd-fix-profile.c
+++ colord-1.0.6/client/cd-fix-profile.c
@@ -746,8 +746,6 @@ main (int argc, char *argv[])
 	textdomain (GETTEXT_PACKAGE);
 	cmsSetLogErrorHandler (cd_util_lcms_error_cb);
 
-	g_type_init ();
-
 	/* create helper object */
 	priv = g_new0 (CdUtilPrivate, 1);
 	priv->client = cd_client_new ();
--- colord-1.0.6.orig/client/cd-iccdump.c
+++ colord-1.0.6/client/cd-iccdump.c
@@ -90,7 +90,6 @@ main (int argc, char **argv)
 	guint retval = EXIT_FAILURE;
 
 	setlocale (LC_ALL, "");
-	g_type_init ();
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--- colord-1.0.6.orig/client/cd-util.c
+++ colord-1.0.6/client/cd-util.c
@@ -2062,8 +2062,6 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_type_init ();
-
 	/* create helper object */
 	priv = g_new0 (CdUtilPrivate, 1);
 
--- colord-1.0.6.orig/configure.ac
+++ colord-1.0.6/configure.ac
@@ -139,7 +139,7 @@ AC_SUBST([RELRO_LDFLAGS])
 dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
 AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
 	      enable_gusb=$enableval, enable_gusb=yes)
 if test x$enable_gusb != xno; then
--- colord-1.0.6.orig/contrib/colord-sane/cd-main.c
+++ colord-1.0.6/contrib/colord-sane/cd-main.c
@@ -373,9 +373,6 @@ main (int argc, char *argv[])
 
 	/* We need to init DBus' threading support as libSANE uses raw DBus */
 	dbus_threads_init_default ();
-#if !GLIB_CHECK_VERSION(2,36,0)
-	g_type_init ();
-#endif
 
 	/* create new objects */
 	priv = g_new0 (CdMainPrivate, 1);
--- colord-1.0.6.orig/contrib/session-helper/cd-main.c
+++ colord-1.0.6/contrib/session-helper/cd-main.c
@@ -2189,7 +2189,6 @@ main (int argc, char *argv[])
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
 	priv = g_new0 (CdMainPrivate, 1);
 	priv->gamma_scale_factor = 10.0f;
 	priv->status = CD_SESSION_STATUS_IDLE;
--- colord-1.0.6.orig/lib/colord/cd-self-test.c
+++ colord-1.0.6/lib/colord/cd-self-test.c
@@ -3893,7 +3893,6 @@ colord_icc_store_func (void)
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
--- colord-1.0.6.orig/lib/colorhug/ch-self-test.c
+++ colord-1.0.6/lib/colorhug/ch-self-test.c
@@ -1208,7 +1208,6 @@ out:
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
--- colord-1.0.6.orig/src/cd-main.c
+++ colord-1.0.6/src/cd-main.c
@@ -2577,7 +2577,6 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_type_init ();
 	priv = g_new0 (CdMainPrivate, 1);
 
 	/* TRANSLATORS: program name */
--- colord-1.0.6.orig/src/cd-self-test.c
+++ colord-1.0.6/src/cd-self-test.c
@@ -475,7 +475,6 @@ cd_device_db_func (void)
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
--- colord-1.0.6.orig/src/sensors/cd-sensor-dump.c
+++ colord-1.0.6/src/sensors/cd-sensor-dump.c
@@ -62,8 +62,6 @@ main (int argc, char **argv)
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
-
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
