gnome-base/gnome-shell: 3.1.4 → 3.1.90

Version bump with a massive number of changes. Two important ones:
* networkmanager is now obligatory, and gnome-shell now provides its own
  equivalent of nm-applet;
* the extension system has been completely overhauled. All assumptions
  about packaging shell extensions in Gentoo will need to be revisited.

Also, old shell extensions appear to cause 3.1.90 to crash at login
or shortly thereafter. Disabling them is not enough; they must be
physically removed from the system.

8 files changed, 257 insertions, 17 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d4f713a4..833575c7 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,8 @@
-DIST gnome-shell-3.1.4.tar.xz 1002024 RMD160 2dbf1f4c7f41b70dbb9eaa26a2b07f4d4c9b93e9 SHA1 0e3c09c382cfe4f994f76d8ca50ef28ac0a9d52b SHA256 bcb6eed9731233a2c57cd39b608d197445755e77fc431e524e6b7a0ec02dbbee
-EBUILD gnome-shell-3.1.4.ebuild 3777 RMD160 6bf67a941147d09d097a97554852c6ea45433019 SHA1 bd634a8a77d75f6147dc21a06155dbf40dc38d79 SHA256 df5ad0d102698acbcb720784787ea93f2d840f0728b12b5232a2f233a70ea952
-EBUILD gnome-shell-9999.ebuild 3777 RMD160 6bf67a941147d09d097a97554852c6ea45433019 SHA1 bd634a8a77d75f6147dc21a06155dbf40dc38d79 SHA256 df5ad0d102698acbcb720784787ea93f2d840f0728b12b5232a2f233a70ea952
+AUX gnome-shell-3.1.90-default-avatar.patch 809 RMD160 6e409eb33a3d4e24080328da82dc3cfeb5f6f2bf SHA1 39197275c214d7bfd7943e776c397bf7a7a28af0 SHA256 7723f67878c000b3fd4626d7a28995f474681b434b19a03bfe03b1d352e59cca
+AUX gnome-shell-3.1.90-folks-crash.patch 1076 RMD160 8420540177746829fbf3bd40305ca0484e2d6fa4 SHA1 b0de4b2db465466238b22922fe8d7e4ac3a78e91 SHA256 b2a53c318902fcd74c12e5b88db80f54a23480a23d6315caaa54dd99359fded7
+AUX gnome-shell-3.1.90-gdm-batch.patch 798 RMD160 82d2a59d170a79b74316f52d8d1da2bd435d176d SHA1 8f48df402112a5f99f18afd5afbc66e4e07f6101 SHA256 a9ea93f56a578c510820c792ff451348a3dd31498e1b7950214a3134ee75f226
+AUX gnome-shell-3.1.90-gi-1.29.17.patch 2350 RMD160 c28faf9a821d270cc5ef74e4735bc428b034326f SHA1 f6f0fb8b964c5c5f6f530cdb87b5d46e20e1197a SHA256 4a91d02616c3c3dc254af35475a7f61583af301fa4f761f4bbb26d2beaa5155c
+AUX gnome-shell-3.1.90-telepathy-status.patch 1489 RMD160 c49a8dd5dbc2dd2298d162afa51a8c774bf845fe SHA1 7faefe8c8a91bce2156bd4718737b5684feb86ba SHA256 8bbf841e83b01e481c6da6684bfe1ed281fdcc5003c6e1df26c97c815e50777e
+DIST gnome-shell-3.1.90.tar.xz 1022100 RMD160 479ea0ef2769fc905359da793e27b8721cc9ad9d SHA1 ef3032f5e930c66708926aaf66c31d654ba08fe3 SHA256 310754ecd7a0b40b46e93fdbde8ccb5477c12a3835640f99224cb8c2fb8a2a6d
+EBUILD gnome-shell-3.1.90.ebuild 4699 RMD160 f41429a52566d972a059623dd8ad2340a0a79a15 SHA1 774781418d0bec6f71a903206d25fdad11c8327e SHA256 8bb466c2d56590884a2ee9cf8460ef737efc631f6139d47b18e4550b7d1f18ca
+EBUILD gnome-shell-9999.ebuild 4324 RMD160 0a33903f7ca3076fd9e5992c62c4526857bcc71c SHA1 083f6dc4b9dc12bc148b827bf23ed1d7876d3575 SHA256 f0b47564e51be3df4feacc135612f250e4e1e7b7617a0294513f44c1a5e34ed8
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
new file mode 100644
index 00000000..f5c3a159
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
@@ -0,0 +1,24 @@
+From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.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
new file mode 100644
index 00000000..695e5b9b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
@@ -0,0 +1,34 @@
+From c2c4c26f72b900d0a95c5daca64c46cb7e281f33 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.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
new file mode 100644
index 00000000..8df0e371
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
@@ -0,0 +1,23 @@
+From 612b9e9faf014f9b9ff8fbf58176769583f69d5f Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 30 Aug 2011 11:52:25 +0000
+Subject: Fix batch import for loginDialog
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Signed-off-by: Adel Gadllah <adel.gadllah@gmail.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
new file mode 100644
index 00000000..7a0505d1
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
@@ -0,0 +1,75 @@
+From 14e8cba2b184b16d0dbd9beb929860a1e1155709 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.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
new file mode 100644
index 00000000..4bd3a1c5
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
@@ -0,0 +1,43 @@
+From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.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/gnome-shell-3.1.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 76307f7e..95594a2a 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nm-applet"
+IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -36,14 +36,17 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 	>=media-libs/clutter-1.7.5:1.0[introspection]
+	>=dev-libs/folks-0.5.2
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	gnome-base/libgnome-keyring
 	>=gnome-extra/evolution-data-server-2.91.6
 	>=media-libs/gstreamer-0.10.16:0.10
 	>=media-libs/gst-plugins-base-0.10.16:0.10
 	>=net-im/telepathy-logger-0.2.4[introspection]
 	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.3[introspection]
+	>=net-libs/telepathy-glib-0.15.5[introspection]
+	>=net-misc/networkmanager-0.8.999[introspection]
 	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-wm/mutter-3.0.0[introspection]
@@ -54,7 +57,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=dev-libs/libcroco-0.6.2:0.6
 
 	gnome-base/gconf:2[introspection]
-	gnome-base/gnome-menus
+	>=gnome-base/gnome-menus-2.29.10:3[introspection]
 	gnome-base/librsvg
 	media-libs/libcanberra
 	media-sound/pulseaudio
@@ -70,7 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 3. gnome-session is needed for gnome-session-quit
 # 4. Control shell settings
 # 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
+# 6. caribou needed for on-screen keyboard
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -85,9 +88,11 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.12
 
-	nm-applet? (
-		>=gnome-extra/nm-applet-0.8.999
-		>=net-misc/networkmanager-0.8.999[introspection] )"
+	>=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.
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -104,6 +109,24 @@ 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_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"
 }
 
 src_install() {
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 76307f7e..2cdf2d0e 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nm-applet"
+IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -36,14 +36,17 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 	>=media-libs/clutter-1.7.5:1.0[introspection]
+	>=dev-libs/folks-0.5.2
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	gnome-base/libgnome-keyring
 	>=gnome-extra/evolution-data-server-2.91.6
 	>=media-libs/gstreamer-0.10.16:0.10
 	>=media-libs/gst-plugins-base-0.10.16:0.10
 	>=net-im/telepathy-logger-0.2.4[introspection]
 	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.3[introspection]
+	>=net-libs/telepathy-glib-0.15.5[introspection]
+	>=net-misc/networkmanager-0.8.999[introspection]
 	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-wm/mutter-3.0.0[introspection]
@@ -54,7 +57,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=dev-libs/libcroco-0.6.2:0.6
 
 	gnome-base/gconf:2[introspection]
-	gnome-base/gnome-menus
+	>=gnome-base/gnome-menus-2.29.10:3[introspection]
 	gnome-base/librsvg
 	media-libs/libcanberra
 	media-sound/pulseaudio
@@ -70,7 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 3. gnome-session is needed for gnome-session-quit
 # 4. Control shell settings
 # 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
+# 6. caribou needed for on-screen keyboard
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -85,9 +88,11 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.12
 
-	nm-applet? (
-		>=gnome-extra/nm-applet-0.8.999
-		>=net-misc/networkmanager-0.8.999[introspection] )"
+	>=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.
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -104,6 +109,14 @@ 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() {