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.

4 files changed, 2 insertions, 103 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 866052b0..32a48cc0 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,8 +1,6 @@
 AUX gnome-shell-3.1.4-gi-1.29.17.patch 2636 RMD160 4f50ca3ae693726c6e6c532801e89c78e9e5a965 SHA1 6275d4d5c6d79c6d874c8d65e54bfbb2318fe552 SHA256 7eb4eec292c53eef3fad38d8a538bc267e322bd3bece66552d4173d31b3d0049
-AUX gnome-shell-3.1.90.1-telepathy-gettext.patch 2128 RMD160 70d02c8b981155b33bd6c83f02c61c78d0a8aca2 SHA1 76d6422cc459cad3b05eff857bb6a856d906142a SHA256 2d74f850873fe0b8370a780de39cd572eea88eedaa9e51d72be0b12328ec9006
-AUX gnome-shell-3.1.90.1-workspaces-lazy-init.patch 2175 RMD160 cfa68433050ef325e2091df6f4e4d1f1a5678ac2 SHA1 a27ad70afe4be556af49a0fd3c8869ab10a01327 SHA256 ca36e5639e358278f662787d264a17e7c33bdf8477ad69045df1512c1646d195
 DIST gnome-shell-3.1.4.tar.xz 1002024 RMD160 2dbf1f4c7f41b70dbb9eaa26a2b07f4d4c9b93e9 SHA1 0e3c09c382cfe4f994f76d8ca50ef28ac0a9d52b SHA256 bcb6eed9731233a2c57cd39b608d197445755e77fc431e524e6b7a0ec02dbbee
-DIST gnome-shell-3.1.90.1.tar.xz 1026384 RMD160 d226d7762a375edf6243bc96770d8dcd5993fe6d SHA1 3cce72442dc0831aa45dd2812fb6ffab2cdd3407 SHA256 710d5aeb32a22b7ecf53c3a74ab1f12ada64428ec23ff68ba1c96fe7a7f0cb4e
+DIST gnome-shell-3.1.91.tar.xz 1038540 RMD160 76a87eff0b1120ece41c5f9e0d49bd81efe913e9 SHA1 1eb842122d80fd827597d61ce1f201cd256c5f77 SHA256 54cc92ee03739ffe7cacdef3138d9a86990e2b204c895f5188c722b802ea585f
 EBUILD gnome-shell-3.1.4.ebuild 3933 RMD160 8cbe800241baaf70bef3f8d3cc376aef0ed25928 SHA1 5d3a4c8378bfa760fa16f5b2c6aebd2fc459b190 SHA256 2947ba3e88054603216bf2485bc6ebf4366052b672f9459c4bd05bacae330425
-EBUILD gnome-shell-3.1.90.1.ebuild 3998 RMD160 757892cba1e81c5c39f4309b108d590a0d2c1dc9 SHA1 b082f481aa778d6e83a22c4a2f28b8be0f8c2e1c SHA256 74730a20e8af69681eb7dd1914bbb72966b35ea46d7383aaaee1adfcbb08661f
+EBUILD gnome-shell-3.1.91.ebuild 3793 RMD160 62aa780286875fa26846b4cfbc2164bec6a002a2 SHA1 0a1c38f3addc16c9212a130ac5032626fef03da7 SHA256 698d56505c8e2377bf71f057c95fd9f07cc68b8f086b0a7c7e969269d6557ac0
 EBUILD gnome-shell-9999.ebuild 3793 RMD160 62aa780286875fa26846b4cfbc2164bec6a002a2 SHA1 0a1c38f3addc16c9212a130ac5032626fef03da7 SHA256 698d56505c8e2377bf71f057c95fd9f07cc68b8f086b0a7c7e969269d6557ac0
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 16f0de4e..00000000
--- 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@gnome.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 5dc408c2..00000000
--- 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@mecheye.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
index 9573aed1..ffa6bc78 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