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

[Alexandre Restovtsev]

commit:     935f17870e4dd3e3c5c8c33f76217b90825b9045
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep  2 05:13:40 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep  2 05:13:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=935f1787

gnome-base/gnome-shell: 3.1.90 → 3.1.90.1

Version bump. Also, remove the incorrect extension warnings from the
live ebuild.

---
 .../files/gnome-shell-3.1.90-default-avatar.patch  |   24 ------
 .../files/gnome-shell-3.1.90-folks-crash.patch     |   34 ---------
 .../files/gnome-shell-3.1.90-gdm-batch.patch       |   23 ------
 .../files/gnome-shell-3.1.90-gi-1.29.17.patch      |   75 --------------------
 .../gnome-shell-3.1.90-telepathy-status.patch      |   43 -----------
 .../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.ebuild => gnome-shell-3.1.90.1.ebuild} |    8 +--
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |   14 +----
 9 files changed, 95 insertions(+), 218 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
deleted file mode 100644
index f5c3a15..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@×××××××.net>
-Date: Mon, 29 Aug 2011 21:41:10 +0000
-Subject: userMenu: Don't show the default avatar over a newly selected one
-
-When we replace the default avatar image with a real image, we need
-to remove the default avatar image.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657657
----
-diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
-index 8d71ce2..33c3315 100644
---- a/js/ui/userMenu.js
-+++ b/js/ui/userMenu.js
-@@ -226,6 +226,7 @@ IMStatusChooserItem.prototype = {
- 
-     _setIconFromFile: function(iconFile) {
-         this._iconBin.set_style('background-image: url("' + iconFile + '");');
-+        this._iconBin.child = null;
-     },
- 
-     _setIconFromName: function(iconName) {
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
deleted file mode 100644
index 695e5b9..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2c4c26f72b900d0a95c5daca64c46cb7e281f33 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@××××××.com>
-Date: Tue, 30 Aug 2011 09:13:35 +0000
-Subject: Don't crash displaying contacts with no alias
-
-If a folks individual has no alias we crash when passing in NULL
-to strstr(). Fix this by checking for non-null first.
----
-diff --git a/src/shell-contact-system.c b/src/shell-contact-system.c
-index 971a164..9ac79de 100644
---- a/src/shell-contact-system.c
-+++ b/src/shell-contact-system.c
-@@ -134,11 +134,14 @@ do_match (ShellContactSystem  *self,
-       const char *p;
- 
-       /* Match on alias */
--      p = strstr (alias, term);
--      if (p == alias)
--        have_alias_prefix = TRUE;
--      else if (p != NULL)
--        have_alias_substring = TRUE;
-+      if (alias != NULL)
-+	{
-+	  p = strstr (alias, term);
-+	  if (p == alias)
-+	    have_alias_prefix = TRUE;
-+	  else if (p != NULL)
-+	    have_alias_substring = TRUE;
-+	}
- 
-       /* Match on one or more IM addresses */
-       im_addrs_iter = gee_iterable_iterator (GEE_ITERABLE (im_addrs));
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
deleted file mode 100644
index 8df0e37..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 612b9e9faf014f9b9ff8fbf58176769583f69d5f Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@××××××××.com>
-Date: Tue, 30 Aug 2011 11:52:25 +0000
-Subject: Fix batch import for loginDialog
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@××××××××.com>
-Signed-off-by: Adel Gadllah <adel.gadllah@×××××.com>
----
-diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
-index 36799e3..3ba8aca 100644
---- a/js/gdm/loginDialog.js
-+++ b/js/gdm/loginDialog.js
-@@ -32,7 +32,7 @@ const Shell = imports.gi.Shell;
- const St = imports.gi.St;
- const GdmGreeter = imports.gi.GdmGreeter;
- 
--const Batch = imports.misc.batch;
-+const Batch = imports.gdm.batch;
- const Lightbox = imports.ui.lightbox;
- const Main = imports.ui.main;
- const ModalDialog = imports.ui.modalDialog;
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
deleted file mode 100644
index 7a0505d..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 14e8cba2b184b16d0dbd9beb929860a1e1155709 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@×××××.org>
-Date: Tue, 30 Aug 2011 16:07:11 +0000
-Subject: Add some (element-type) annotations to appease g-i master
-
----
-diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
-index 56502e3..168bc79 100644
---- a/src/gvc/gvc-mixer-card.c
-+++ b/src/gvc/gvc-mixer-card.c
-@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
-         return TRUE;
- }
- 
-+/**
-+ * gvc_mixer_card_get_profiles:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerCardProfile):
-+ */
- const GList *
- gvc_mixer_card_get_profiles (GvcMixerCard *card)
- {
-@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
-         return -1;
- }
- 
-+/**
-+ * gvc_mixer_card_set_profiles:
-+ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
-+ */
- gboolean
- gvc_mixer_card_set_profiles (GvcMixerCard *card,
-                              GList        *profiles)
-diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
-index 78de6b3..f35954a 100644
---- a/src/gvc/gvc-mixer-stream.c
-+++ b/src/gvc/gvc-mixer-stream.c
-@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
-         return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
- }
- 
-+/**
-+ * gvc_mixer_stream_get_ports:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerStreamPort):
-+ */
- const GList *
- gvc_mixer_stream_get_ports (GvcMixerStream *stream)
- {
-@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
-         return -1;
- }
- 
-+/**
-+ * gvc_mixer_stream_set_ports:
-+ * @ports: (transfer full) (element-type GvcMixerStreamPort):
-+ */
- gboolean
- gvc_mixer_stream_set_ports (GvcMixerStream *stream,
-                             GList          *ports)
-diff --git a/src/shell-app.c b/src/shell-app.c
-index 75444b6..0455f42 100644
---- a/src/shell-app.c
-+++ b/src/shell-app.c
-@@ -1051,7 +1051,7 @@ _gather_pid_callback (GDesktopAppInfo   *gapp,
- /**
-  * shell_app_launch:
-  * @timestamp: Event timestamp, or 0 for current event timestamp
-- * @uris: List of uris to pass to application
-+ * @uris: (element-type utf8): List of uris to pass to application
-  * @workspace: Start on this workspace, or -1 for default
-  * @startup_id: (out): Returned startup notification ID, or %NULL if none
-  * @error: A #GError
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
deleted file mode 100644
index 4bd3a1c..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@××××××××××××.uk>
-Date: Tue, 30 Aug 2011 12:35:20 +0000
-Subject: don't translate IM status
-
-They are well-known strings defined in the Telepathy spec and so shouldn't be
-translated.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657696
----
-diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
-index 33c3315..115bcf7 100644
---- a/js/ui/userMenu.js
-+++ b/js/ui/userMenu.js
-@@ -250,19 +250,19 @@ IMStatusChooserItem.prototype = {
-     _statusForPresence: function(presence) {
-         switch(presence) {
-             case Tp.ConnectionPresenceType.AVAILABLE:
--                return _("Available");
-+                return 'available';
-             case Tp.ConnectionPresenceType.BUSY:
--                return _("Busy");
-+                return 'busy';
-             case Tp.ConnectionPresenceType.OFFLINE:
--                return _("Unavailable");
-+                return 'offline';
-             case Tp.ConnectionPresenceType.HIDDEN:
--                return _("Hidden");
-+                return 'hidden';
-             case Tp.ConnectionPresenceType.AWAY:
--                return _("Away");
-+                return 'away';
-             case Tp.ConnectionPresenceType.EXTENDED_AWAY:
--                return _("Idle");
-+                return 'xa';
-             default:
--                return _("Unknown");
-+                return 'unknown';
-         }
-     },
- 
---
-cgit v0.9.0.2

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
new file mode 100644
index 0000000..16f0de4
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000..5dc408c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
@@ -0,0 +1,52 @@
+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.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
similarity index 92%
rename from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
index 258babe..9573aed 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
@@ -110,12 +110,8 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 	# Useful patches from upstream git, will be in next release
-	epatch "${FILESDIR}/${P}-default-avatar.patch"
-	epatch "${FILESDIR}/${P}-folks-crash.patch"
-	epatch "${FILESDIR}/${P}-gdm-batch.patch"
-	epatch "${FILESDIR}/${P}-telepathy-status.patch"
-	# gobject-introspection-1.29.17 compat, will be in next release
-	epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
+	epatch "${FILESDIR}/${P}-telepathy-gettext.patch"
+	epatch "${FILESDIR}/${P}-workspaces-lazy-init.patch"
 }
 
 src_install() {

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 2cdf2d0..ffa6bc7 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -88,11 +88,7 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.12
 
-	>=app-accessibility/caribou-0.3
-
-	!!<=gnome-extra/gnome-shell-extensions-3.1.4"
-# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
-# Disabling the extensions is not enough; they must be physically uninstalled.
+	>=app-accessibility/caribou-0.3"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -109,14 +105,6 @@ pkg_setup() {
 		--enable-compile-warnings=maximum
 		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script"
-
-	ewarn
-	ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
-	ewarn "old shell extensions *installed*, whether systemwide or in a user's"
-	ewarn "home directory."
-	ewarn "Disabling the extensions is not enough. You should uninstall the"
-	ewarn "extensions before upgrading gnome-shell to ${PV}."
-	ewarn
 }
 
 src_install() {