[arch-commits] Commit in cinnamon/trunk (PKGBUILD fix-typo-property-name.patch)

[Alexandre Filgueira]

    Date: Friday, May 3, 2013 @ 21:44:28
  Author: faidoc
Revision: 89865

upgpkg: cinnamon 1.7.9-1

Added:
  cinnamon/trunk/fix-typo-property-name.patch
Modified:
  cinnamon/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   12 +++---
 fix-typo-property-name.patch |   80 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-03 19:33:13 UTC (rev 89864)
+++ PKGBUILD	2013-05-03 19:44:28 UTC (rev 89865)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.8
-pkgrel=2
+pkgver=1.7.9
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -30,14 +30,16 @@
         "gnome-3.8.patch"
         "switch-applications.patch"
         "fallback-helpers.patch"
-        "idle-dim.patch")
-sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969'
+        "idle-dim.patch"
+        "fix-typo-property-name.patch")
+sha256sums=('69b0ae4703ece04b5e8ef3ee547118d9d5e0ee212b456341ec6ef77d70117822'
             'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
             '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3'
             '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
             'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
-            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
+            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
+            '39be7e455582d9648e0006e4ab87cabdfaaa14bf441f8c3834f07f2d3c1bb66a')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*

Added: fix-typo-property-name.patch
===================================================================
--- fix-typo-property-name.patch	                        (rev 0)
+++ fix-typo-property-name.patch	2013-05-03 19:44:28 UTC (rev 89865)
@@ -0,0 +1,80 @@
+From 3340f04561f1f15b00501d827378a64c085f3f9c Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Fri, 3 May 2013 14:38:29 -0400
+Subject: [PATCH 1/3] Fix typo for property name
+
+---
+ files/usr/lib/cinnamon-settings/bin/ExtensionCore.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py b/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
+index db08319..df7ef24 100644
+--- a/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
++++ b/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
+@@ -1053,7 +1053,7 @@ def load_extensions_in(self, directory, stock_theme = False):
+                             except KeyError: last_edited = -1
+                             except ValueError: last_edited = -1
+ 
+-                            try: schema_filename = data["schema-filename"]
++                            try: schema_filename = data["schema-file"]
+                             except KeyError: schema_filename = ""
+                             except ValueError: schema_filename = ""
+ 
+-- 
+1.8.1.6
+
+
+From 23d85f66090409527b7af5f572eb1ef6a6a670d6 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Fri, 3 May 2013 14:45:11 -0400
+Subject: [PATCH 2/3] Add path to trashed filename
+
+---
+ files/usr/lib/cinnamon-settings/bin/Spices.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/bin/Spices.py b/files/usr/lib/cinnamon-settings/bin/Spices.py
+index 7d79050..22bbbfb 100644
+--- a/files/usr/lib/cinnamon-settings/bin/Spices.py
++++ b/files/usr/lib/cinnamon-settings/bin/Spices.py
+@@ -334,7 +334,7 @@ def load_assets(self, uuids=None):
+                 trash.append(f)
+         for t in trash:
+             try:
+-                os.remove(t)
++                os.remove(os.path.join(self.cache_folder, t))
+             except:
+                 pass
+ 
+-- 
+1.8.1.6
+
+
+From 95c96f03819f3171000b225833ac5194f5dd41c1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Fri, 3 May 2013 14:57:20 -0400
+Subject: [PATCH 3/3] DND: When the drag actor is differently than the original
+ actor, center the handle on it, instead of basing drag offset calculation on
+ the original.
+
+---
+ js/ui/dnd.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/dnd.js b/js/ui/dnd.js
+index c21b03d..ecae02f 100644
+--- a/js/ui/dnd.js
++++ b/js/ui/dnd.js
+@@ -340,8 +340,8 @@ _Draggable.prototype = {
+             }
+             this._dragOrigParent = undefined;
+ 
+-            this._dragOffsetX = this._dragStartX - this._dragActor.x;
+-            this._dragOffsetY = this._dragStartY - this._dragActor.y;
++            this._dragOffsetX = this._dragActor.width / 2;
++            this._dragOffsetY = this._dragActor.height / 2;
+         } else {
+             this._dragActor = this.actor;
+             this._dragActorSource = undefined;
+-- 
+1.8.1.6