diff --git a/cinnamon.spec b/cinnamon.spec index f597541..4e88a8e 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -8,7 +8,7 @@ Name: cinnamon Version: 2.6.13 -Release: 9%{?dist} +Release: 8%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -47,7 +47,6 @@ Patch13: upstream_next.patch Patch14: spice_refresh_fix.patch Patch15: 0001-Revert-Keyboard-applet-Show-text-when-layout-icon-is.patch Patch16: fix-Deprecation-Warning.patch -Patch17: glib2_settings.patch %global clutter_version 1.12.2 %global cjs_version 2.6.2 @@ -186,6 +185,9 @@ This package contains the code documentation for various Cinnamon components. sed -i -e 's@gksu@pkexec@g' files/usr/bin/cinnamon-settings-users sed -i -e 's@blueberry@blueman-manager@g' files/usr/lib/cinnamon-settings/cinnamon-settings.py +%if (0%{?fedora} && 0%{?fedora} < 21) +sed -i -e 's@Gtk.LinkButton()@Gtk.LinkButton("")@g' files/usr/lib/cinnamon-settings/modules/cs_themes.py +%endif NOCONFIGURE=1 ./autogen.sh @@ -286,9 +288,6 @@ fi %doc %{_datadir}/gtk-doc/html/*/ %changelog -* Fri Aug 28 2015 Leigh Scott - 2.6.13-9 -- add patch to fix glib2 regression - * Tue Aug 25 2015 Leigh Scott - 2.6.13-8 - fix deprecation warning on cinnamon-settings diff --git a/glib2_settings.patch b/glib2_settings.patch deleted file mode 100644 index ccc73f7..0000000 --- a/glib2_settings.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /home/leigh/development/cvs/cinnamon/Cinnamon-2.6.13/js/ui/overrides (copy).js -+++ /home/leigh/development/cvs/cinnamon/Cinnamon-2.6.13/js/ui/overrides.js -@@ -70,6 +70,7 @@ - Gio._real_set_enum = Gio.Settings.prototype.set_enum; - Gio._real_get_flags = Gio.Settings.prototype.get_flags; - Gio._real_set_flags = Gio.Settings.prototype.set_flags; -+ Gio._real_connect = Gio.Settings.prototype.connect; - - Gio.Settings.prototype._init = function(params) { check_schema_and_init(this, Gio._real_init, params); } - Gio.Settings.prototype.get_value = function(key) { return check_key_and_get(this, Gio._real_get_value, key); } -@@ -90,6 +91,18 @@ - Gio.Settings.prototype.set_enum = function(key, val) { return check_key_and_set(this, Gio._real_set_enum, key, val); } - Gio.Settings.prototype.get_flags = function(key) { return check_key_and_get(this, Gio._real_get_flags, key); } - Gio.Settings.prototype.set_flags = function(key, val) { return check_key_and_set(this, Gio._real_set_flags, key, val); } -+ -+ // Stupid GLib doesn't listen to changed::key signals until you read a -+ // value. -+ Gio.Settings.prototype.connect = function(signal, callback) { -+ Gio._real_connect.call(this, signal, callback); -+ if (signal == "changed") { -+ for (let sig of this.list_keys()) -+ this.get_value(sig); -+ } else if (signal.startsWith("changed::") { -+ this.get_value(signal.substring(9, signal.length)); -+ } -+ }; - } - - function overrideGObject() {