packages: gnome-shell/gnome-shell.spec, gnome-shell/extension-delete.patch ...

[glen]

Author: glen                         Date: Thu Dec 15 16:43:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch the extension delete as well

---- Files affected:
packages/gnome-shell:
   gnome-shell.spec (1.32 -> 1.33) , extension-delete.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-shell/gnome-shell.spec
diff -u packages/gnome-shell/gnome-shell.spec:1.32 packages/gnome-shell/gnome-shell.spec:1.33
--- packages/gnome-shell/gnome-shell.spec:1.32	Thu Dec 15 17:18:37 2011
+++ packages/gnome-shell/gnome-shell.spec	Thu Dec 15 17:43:35 2011
@@ -8,6 +8,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.2/%{name}-%{version}.tar.xz
 # Source0-md5:	9519921d31d8c43d054dbc11e1f0733b
 Patch0:		browser-plugin-webkit.patch
+Patch1:		extension-delete.patch
 URL:		http://live.gnome.org/GnomeShell
 BuildRequires:	GConf2-devel
 BuildRequires:	NetworkManager-devel >= 0.8.999
@@ -96,6 +97,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -191,6 +193,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2011/12/15 16:43:35  glen
+- patch the extension delete as well
+
 Revision 1.32  2011/12/15 16:18:37  glen
 - fix extensions.gnome.org for webkit based browsers
 

================================================================
Index: packages/gnome-shell/extension-delete.patch
diff -u /dev/null packages/gnome-shell/extension-delete.patch:1.1
--- /dev/null	Thu Dec 15 17:43:40 2011
+++ packages/gnome-shell/extension-delete.patch	Thu Dec 15 17:43:35 2011
@@ -0,0 +1,46 @@
+From ef49670ae491993cbfcfe666d389485c3a7c8adb Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Thu, 01 Dec 2011 02:46:52 +0000
+Subject: fileUtils: Fix recursivelyDeleteDir
+
+---
+diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
+index cd7339c..7466be8 100644
+--- a/js/misc/fileUtils.js
++++ b/js/misc/fileUtils.js
+@@ -38,7 +38,7 @@ function recursivelyDeleteDir(dir) {
+         let child = dir.get_child(info.get_name());
+         if (type == Gio.FileType.REGULAR)
+             deleteGFile(child);
+-        else if (type == Gio.TypeType.DIRECTORY)
++        else if (type == Gio.FileType.DIRECTORY)
+             recursivelyDeleteDir(child);
+     }
+ 
+--
+cgit v0.9.0.2
+From bbb83656bf83c9740fe68db7e35e05ea4f129b01 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Thu, 01 Dec 2011 03:02:09 +0000
+Subject: extensionSystem: Set the proper 'enabled' and 'type' parameters
+
+When installing an extension at runtime, we accidentally swapped the 'type'
+and 'enabled' parameters. While this doesn't directly affect anything right
+now, as everything works coincidentally, future patches that look at the
+'type' parameter to decide what to do would get the wrong answer.
+---
+diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
+index a0302fe..9aadb3a 100644
+--- a/js/ui/extensionSystem.js
++++ b/js/ui/extensionSystem.js
+@@ -202,7 +202,7 @@ function gotExtensionZipFile(session, message, uuid) {
+             global.settings.set_strv(ENABLED_EXTENSIONS_KEY, enabledExtensions);
+         }
+ 
+-        loadExtension(dir, true, ExtensionType.PER_USER);
++        loadExtension(dir, ExtensionType.PER_USER, true);
+     });
+ }
+ 
+--
+cgit v0.9.0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-shell/gnome-shell.spec?r1=1.32&r2=1.33&f=u