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

[Alexandre Restovtsev]

commit:     5d56018a12cccc94b203ae5d82f6398b4fc84165
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Aug 31 08:35:06 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Aug 31 11:44:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5d56018a

gnome-base/gnome-shell: restore 3.1.4

Restore 3.1.4 (with a patch for gobject-introspection-1.29.17 compat)
since 3.1.90 appears to be somewhat unstable. The instability does not
appear to depend on extensions after all, so remove the blocker and
warnings.

---
 .../files/gnome-shell-3.1.4-gi-1.29.17.patch       |   82 ++++++++++++++++++++
 ...hell-3.1.90.ebuild => gnome-shell-3.1.4.ebuild} |   35 ++------
 gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild   |   15 +---
 3 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
new file mode 100644
index 0000000..6aebc44
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
@@ -0,0 +1,82 @@
+From 92d0cce50c9baac2a24d840b1db39f2627a02480 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@×××××.org>
+Date: Tue, 30 Aug 2011 12:07:11 -0400
+Subject: [PATCH] Add some (element-type) annotations to appease g-i master
+
+[Alexandre Rostovtsev <tetromino@×××××.com>: backport to 3.1.4]
+---
+ src/gvc/gvc-mixer-card.c   |    9 +++++++++
+ src/gvc/gvc-mixer-stream.c |    9 +++++++++
+ src/shell-app-system.c     |    2 +-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+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-system.c b/src/shell-app-system.c
+index b52625a..a578e69 100644
+--- a/src/shell-app-system.c
++++ b/src/shell-app-system.c
+@@ -1399,7 +1399,7 @@ _gather_pid_callback (GDesktopAppInfo   *gapp,
+ /**
+  * shell_app_info_launch_full:
+  * @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
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
similarity index 75%
copy from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
copy to gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
index 95594a2..d0c4ba3 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+nm-applet"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -36,17 +36,14 @@ 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.5[introspection]
-	>=net-misc/networkmanager-0.8.999[introspection]
+	>=net-libs/telepathy-glib-0.15.3[introspection]
 	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-wm/mutter-3.0.0[introspection]
@@ -57,7 +54,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-2.29.10:3[introspection]
+	gnome-base/gnome-menus
 	gnome-base/librsvg
 	media-libs/libcanberra
 	media-sound/pulseaudio
@@ -73,7 +70,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. caribou needed for on-screen keyboard
+# 6. nm-applet is needed for auth prompting and the wireless connection dialog
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -88,11 +85,9 @@ 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.
+	nm-applet? (
+		>=gnome-extra/nm-applet-0.8.999
+		>=net-misc/networkmanager-0.8.999[introspection] )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -109,23 +104,11 @@ 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
+	gnome2_src_prepare
+	# gobject-introspection-1.29.17 compat, backported to gnome-shell-3.1.4
 	epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
 }
 

diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 95594a2..258babe 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.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,17 +105,10 @@ 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() {
+	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"