[cinnamon-desktop] patch cinnamon-desktop-migrate-mediakeys

[leigh123linux]

commit aa0876b88702c8f566bb1ab66ce887133adcfed5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 12 17:41:06 2014 +0000

    patch cinnamon-desktop-migrate-mediakeys

 ...-migrate-script-compatible-with-glib-2.40.patch |   47 ++++++++++++++++++++
 cinnamon-desktop.spec                              |    8 +++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0001-Make-migrate-script-compatible-with-glib-2.40.patch b/0001-Make-migrate-script-compatible-with-glib-2.40.patch
new file mode 100644
index 0000000..9219e7a
--- /dev/null
+++ b/0001-Make-migrate-script-compatible-with-glib-2.40.patch
@@ -0,0 +1,47 @@
+From fbefd593f353c408f6a7a3bdc6e43b6ea19a26b0 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Wed, 12 Nov 2014 12:13:25 -0500
+Subject: [PATCH] Make migrate script compatible with glib < 2.40
+
+---
+ files/usr/bin/cinnamon-desktop-migrate-mediakeys | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/files/usr/bin/cinnamon-desktop-migrate-mediakeys b/files/usr/bin/cinnamon-desktop-migrate-mediakeys
+index ff01405..34b78cf 100755
+--- a/files/usr/bin/cinnamon-desktop-migrate-mediakeys
++++ b/files/usr/bin/cinnamon-desktop-migrate-mediakeys
+@@ -27,13 +27,23 @@ def migrate(old, new, array):
+     new_list = new_settings.list_keys()
+ 
+     for k in new_list:
+-        if k in old_list and old_settings.get_user_value(k) is not None:
+-            if array:
+-                new_settings.set_value(k, old_settings.get_value(k))
+-            else:
+-                ov = old_settings.get_string(k)
+-                new_settings.set_strv(k, (ov,))
+-
++        try:
++            try:
++                if k in old_list and old_settings.get_user_value(k) is not None:
++                    if array:
++                        new_settings.set_value(k, old_settings.get_value(k))
++                    else:
++                        ov = old_settings.get_string(k)
++                        new_settings.set_strv(k, (ov,))
++            except:
++                if k in old_list:
++                    if array:
++                        new_settings.set_value(k, old_settings.get_value(k))
++                    else:
++                        ov = old_settings.get_string(k)
++                        new_settings.set_strv(k, (ov,))
++        except:
++            print "Problem migrating key %s from %s to %s, skipping it" % (k, old, new)
+     Gio.Settings.sync()
+ 
+ def migrate_custom_keys():
+-- 
+1.9.3
+
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index 1b253d5..3579a1b 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -7,7 +7,7 @@
 Summary: Shared code among cinnamon-session, nemo, etc
 Name:    cinnamon-desktop
 Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+ add MIT
 URL:     http://cinnamon.linuxmint.com
 # To generate tarball
@@ -15,6 +15,8 @@ URL:     http://cinnamon.linuxmint.com
 #Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%%{version}.git%%{_internal_version}.tar.gz
 Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-desktop/source/cinnamon-desktop-%{version}.tar.gz
 
+Patch0:   0001-Make-migrate-script-compatible-with-glib-2.40.patch
+
 Requires: redhat-menus
 
 # Make sure to update libgnome schema when changing this
@@ -56,6 +58,7 @@ libcinnamondesktop.
 
 %prep
 %setup -q
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -99,6 +102,9 @@ fi
 %{_datadir}/gir-1.0/C*-3.0.gir
 
 %changelog
+* Wed Nov 12 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.1-2
+- patch cinnamon-desktop-migrate-mediakeys
+
 * Sat Nov 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.1-1
 - update to 2.4.1