[cinnamon] update to latest git

leigh123linux leigh123linux at fedoraproject.org
Fri Jul 26 09:14:17 UTC 2013


commit ceec61cc3d6190c7411d4aeebd850d30d287a1e2
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 26 10:14:07 2013 +0100

    update to latest git
    
    - fix panel-edit crash

 .gitignore            |    1 +
 cinnamon.spec         |   23 +++++++++++++++++------
 panel-edit-mode.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 sources               |    2 +-
 4 files changed, 60 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06ae932..4a2978a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /gnome-settings-daemon-compat-3.6.4-1.tar.xz
 /cinnamon-1.9.2.gitc321232.tar.gz
 /cinnamon-1.9.2.git435e7a2.tar.gz
+/cinnamon-1.9.2.git39fc3a7.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 61b5c0e..bac8a23 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
-%global _internal_version  435e7a2
+%global _internal_version  39fc3a7
 
 Name:           cinnamon
 Version:        1.9.2
-Release:        0.4.git%{_internal_version}%{?dist}
+Release:        0.5.git%{_internal_version}%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -24,8 +24,9 @@ Patch5:         fix_default_theme.patch
 Patch6:         replace_gksu.patch
 Patch7:         use_fedora_firewall.patch
 Patch8:         automake_14.patch
-Patch9:         keyboard_applet.patch
-Patch10:         idle-dim.patch
+Patch9:         panel-edit-mode.patch
+Patch10:        keyboard_applet.patch
+Patch11:        idle-dim.patch
 
 %global clutter_version 1.12.2
 %global gobject_introspection_version 1.34.2
@@ -138,12 +139,18 @@ The emphasis is put on making users feel at home and providing
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-#patch9 -p1
+%patch9 -p1
 #patch10 -p1
+#patch11 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --disable-static --disable-rpath --disable-schemas-compile --enable-introspection=yes --enable-compile-warnings=no
+%configure \
+ --disable-static \
+ --disable-rpath \
+ --disable-schemas-compile \
+ --enable-introspection=yes \
+ --enable-compile-warnings=no 
 
 make %{?_smp_mflags} V=1
 
@@ -208,6 +215,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 26 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.5.git39fc3a7
+- update to latest git
+- fix panel-edit crash
+
 * Thu Jul 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.4.git435e7a2
 - Fix automake warnings
 
diff --git a/panel-edit-mode.patch b/panel-edit-mode.patch
new file mode 100644
index 0000000..36dcb63
--- /dev/null
+++ b/panel-edit-mode.patch
@@ -0,0 +1,41 @@
+--- a/js/ui/appletManager.js
++++ b/js/ui/appletManager.js
+@@ -348,7 +348,7 @@ function createApplet(extension, appletD
+     return(applet);
+ }
+ 
+-function _removeAppletFromPanel(menuitem, event, uuid, applet_id) {
++function _removeAppletFromPanel(obj, event, keepMenu, uuid, applet_id) {
+     let enabledApplets = enabledAppletDefinitions.raw;
+     for (let i=0; i<enabledApplets.length; i++) {
+         let appletDefinition = getAppletDefinition(enabledApplets[i]);
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -695,13 +695,13 @@ Panel.prototype = {
+                     this._shiftActor();
+         }));
+ 
+-        this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));                            
+-        
+-        this._onPanelEditModeChanged();
++        this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));
++
+         global.settings.connect("changed::panel-edit-mode", Lang.bind(this, this._onPanelEditModeChanged));
+         global.settings.connect("changed::panel-resizable", Lang.bind(this, this._processPanelSize));
+         global.settings.connect("changed::panel-scale-text-icons", Lang.bind(this, this._onScaleTextIconsChanged))
+         this.actor.connect('style-changed', Lang.bind(this, this._processPanelSize));
++        this.actor.connect('parent-set', Lang.bind(this, this._onPanelEditModeChanged));
+     },
+ 
+     isHideable: function() {
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -83,7 +83,7 @@ PopupBaseMenuItem.prototype = {
+     },
+ 
+     _onButtonReleaseEvent: function (actor, event) {
+-        this.activate(event);
++        this.activate(event, false);
+         return true;
+     },
+ 
diff --git a/sources b/sources
index e29b004..16eebd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52ef252447d508de440ba7ed486f866d  cinnamon-1.9.2.git435e7a2.tar.gz
+0229d8233bc3f889c79d24ba8da1c301  cinnamon-1.9.2.git39fc3a7.tar.gz


More information about the scm-commits mailing list