[gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

[Alexandre Restovtsev]

commit:     273582b45205db4eb484b0361ce9e59e71aa8f53
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 05:56:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 05:56:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=273582b4

gnome-base/gnome-shell: 3.1.90.1 → 3.1.91

Version bump, fixes the apps-disappearing-from-Alt-Tab bug. Patches were
applied upstream.

---
 .../gnome-shell-3.1.90.1-telepathy-gettext.patch   |   40 ---------------
 ...gnome-shell-3.1.90.1-workspaces-lazy-init.patch |   52 --------------------
 ...l-3.1.90.1.ebuild => gnome-shell-3.1.91.ebuild} |    7 ---
 3 files changed, 0 insertions(+), 99 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
deleted file mode 100644
index 16f0de4..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88f2bbba61f4d158c281fc061ddacb887d5224d8 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@×××××.org>
-Date: Tue, 30 Aug 2011 20:16:28 +0000
-Subject: telepathyClient: don't try to translate concatenations of strings
-
-xgettext doesn't recognize it
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657759
----
-diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
-index 9e0f3ef..1fba939 100644
---- a/js/ui/telepathyClient.js
-+++ b/js/ui/telepathyClient.js
-@@ -1426,8 +1426,7 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
-   = _("This resource is already connected to the server");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
--  = _("Connection has been replaced by a new connection using the "
--    + "same resource");
-+  = _("Connection has been replaced by a new connection using the same resource");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
-   = _("The account already exists on the server");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
-@@ -1435,12 +1434,9 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)]
-   = _("Certificate has been revoked");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
--  = _("Certificate uses an insecure cipher algorithm or is "
--    + "cryptographically weak");
-+  = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
--  = _("The length of the server certificate, or the depth of the "
--    + "server certificate chain, exceed the limits imposed by the "
--    + "cryptography library");
-+  = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
- 
- AccountNotification.prototype = {
-     __proto__: MessageTray.Notification.prototype,
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
deleted file mode 100644
index 5dc408c..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3aa904da0aa938c3fee09357bcff3a1de6321308 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@×××××××.net>
-Date: Thu, 01 Sep 2011 20:09:46 +0000
-Subject: workspacesView: Only connect to nWorkspacesChanged after we've lazily inited
-
-We lazily init this._workspaces, so we shouldn't try to run any code that uses
-it until after it's been created.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658007
----
-diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
-index 955aee0..f240682 100644
---- a/js/ui/workspacesView.js
-+++ b/js/ui/workspacesView.js
-@@ -567,8 +567,6 @@ WorkspacesDisplay.prototype = {
-         this._updateAlwaysZoom();
- 
-         Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));
--        global.screen.connect('notify::n-workspaces',
--                              Lang.bind(this, this._workspacesChanged));
- 
-         Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
-             this._alwaysZoomOut = true;
-@@ -581,6 +579,7 @@ WorkspacesDisplay.prototype = {
- 
-         this._switchWorkspaceNotifyId = 0;
- 
-+        this._nWorkspacesChangedId = 0;
-         this._itemDragBeginId = 0;
-         this._itemDragCancelledId = 0;
-         this._itemDragEndId = 0;
-@@ -589,7 +588,7 @@ WorkspacesDisplay.prototype = {
-         this._windowDragEndId = 0;
-     },
- 
--   show: function() {
-+    show: function() {
-         this._zoomOut = this._alwaysZoomOut;
-         this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
-         this._updateZoom();
-@@ -612,6 +611,9 @@ WorkspacesDisplay.prototype = {
-             global.screen.connect('restacked',
-                                   Lang.bind(this, this._onRestacked));
- 
-+        if (this._nWorkspacesChangedId == 0)
-+            this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
-+                                                               Lang.bind(this, this._workspacesChanged));
-         if (this._itemDragBeginId == 0)
-             this._itemDragBeginId = Main.overview.connect('item-drag-begin',
-                                                           Lang.bind(this, this._dragBegin));
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
similarity index 94%
rename from gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
index 9573aed..ffa6bc7 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
@@ -107,13 +107,6 @@ pkg_setup() {
 		--disable-jhbuild-wrapper-script"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-	# Useful patches from upstream git, will be in next release
-	epatch "${FILESDIR}/${P}-telepathy-gettext.patch"
-	epatch "${FILESDIR}/${P}-workspaces-lazy-init.patch"
-}
-
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool