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

[Alexandre Restovtsev]

commit:     6716ca4b40d079bd337c4b3ee629ff6c0c856833
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 21:27:04 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 21:53:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6716ca4b

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.

---
 .../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 +++++++++++
 ...hell-3.1.4.ebuild => gnome-shell-3.1.90.ebuild} |   37 ++++++++--
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |   27 +++++--
 7 files changed, 249 insertions(+), 14 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
new file mode 100644
index 0000000..f5c3a15
--- /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@×××××××.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 0000000..695e5b9
--- /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@××××××.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 0000000..8df0e37
--- /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@××××××××.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
new file mode 100644
index 0000000..7a0505d
--- /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@×××××.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 0000000..4bd3a1c
--- /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@××××××××××××.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
similarity index 74%
rename from gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 76307f7..95594a2 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 76307f7..2cdf2d0 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() {