From 7ac06cffda08a7e8d0397d0212ac00e5595b2663 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Jan 2012 12:55:19 -0500 Subject: [PATCH] More fixes --- colord.spec | 6 +++--- variant-iter.patch | 22 +++++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/colord.spec b/colord.spec index 573b210..e409d96 100644 --- a/colord.spec +++ b/colord.spec @@ -1,7 +1,7 @@ Summary: Color daemon Name: colord Version: 0.1.16 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/colord/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz @@ -40,7 +40,7 @@ Files for development with %{name}. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .iter %build %configure \ @@ -106,7 +106,7 @@ exit 0 %{_datadir}/vala/vapi/*.vapi %changelog -* Fri Jan 20 2012 Matthias Clasen - 0.1.16-2 +* Fri Jan 20 2012 Matthias Clasen - 0.1.16-3 - Fix some obvious bugs * Tue Jan 17 2012 Richard Hughes 0.1.16-1 diff --git a/variant-iter.patch b/variant-iter.patch index 43cfc1d..5b1a5ee 100644 --- a/variant-iter.patch +++ b/variant-iter.patch @@ -1,8 +1,20 @@ -diff --git a/libcolord/cd-profile.c b/libcolord/cd-profile.c -index 03decf8..95efc46 100644 ---- a/libcolord/cd-profile.c -+++ b/libcolord/cd-profile.c -@@ -440,8 +440,7 @@ cd_profile_set_metadata_from_variant (CdProfile *profile, GVariant *variant) +diff -up colord-0.1.16/libcolord/cd-device.c.iter colord-0.1.16/libcolord/cd-device.c +--- colord-0.1.16/libcolord/cd-device.c.iter 2012-01-20 12:54:20.620011834 -0500 ++++ colord-0.1.16/libcolord/cd-device.c 2012-01-20 12:54:32.586012014 -0500 +@@ -472,8 +472,7 @@ cd_device_set_metadata_from_variant (CdD + g_hash_table_remove_all (device->priv->metadata); + + /* insert the new metadata */ +- g_variant_get (variant, "a{ss}", +- &iter); ++ g_variant_iter_init (&iter, variant); + while (g_variant_iter_loop (iter, "{ss}", + &prop_key, &prop_value)) { + g_hash_table_insert (device->priv->metadata, +diff -up colord-0.1.16/libcolord/cd-profile.c.iter colord-0.1.16/libcolord/cd-profile.c +--- colord-0.1.16/libcolord/cd-profile.c.iter 2011-09-13 07:38:56.000000000 -0400 ++++ colord-0.1.16/libcolord/cd-profile.c 2012-01-20 12:54:02.525011562 -0500 +@@ -440,8 +440,7 @@ cd_profile_set_metadata_from_variant (Cd g_hash_table_remove_all (profile->priv->metadata); /* insert the new metadata */