gnome-base/gnome-shell: 3.0.1-r2 → 3.0.2

Version bump with lots of bugs fixed, memory leaks plugged, and
networkmanager support improved. Tarball of patches no longer needed
(0001-0006 were applied upstream; 0007 replaced with updated
gnome-shell-3.0.2-user-removed-signals.patch). Update networkmanager
dependencies to 0.8.999. Add accountsservice runtime dependency (needed
for GdmUserManager).

Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>

4 files changed, 53 insertions, 14 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 4567705c..d9d87a25 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,4 +1,4 @@
-DIST gnome-shell-3.0.1-patches-0.1.tar.xz 3004 RMD160 27550090150b5f88272a49d2f7ef426865fa5e30 SHA1 302555d0fc6079d2a8c5df8b205cc2290b48bdf5 SHA256 c8bfdabf4355deebd02a1ace2adb3b3a39587f42e6362e008c129af127d9832f
-DIST gnome-shell-3.0.1.tar.bz2 1067416 RMD160 46bbcbd2519a032aaaf96355de0192d078567f59 SHA1 0364c5c1cc7eb40a292e2b07a1c118a2386a8598 SHA256 01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079
-EBUILD gnome-shell-3.0.1-r2.ebuild 3582 RMD160 4e739be47d8b463a873ccf1d01ec837db2fc705c SHA1 dea42f12adbd9f4b59d5227912abca16f72f9e3c SHA256 c856601f6cb9687926af719fba6f1a40968e5fd35affb973ea142c6fdb998e0d
-EBUILD gnome-shell-9999.ebuild 3434 RMD160 183ee5d3bf291c740ba54aec053b42bfba6ae1f3 SHA1 156275af1a3addf3bdbb3dc99a07d7b5a9f996dd SHA256 51065eac035ac3e4048b72d6804d245bf6eb215d0b3da77be89837cdaf2e44be
+AUX gnome-shell-3.0.2-user-removed-signals.patch 1252 RMD160 74eeaa734afa678a03ab6aa108197871a076d504 SHA1 f419c8d6c69dc3a7232345e2730a1f34605227f7 SHA256 6ce72c46e9abbfa21e58abaeea872202df0609aaaa1233822f53758cfd901348
+DIST gnome-shell-3.0.2.tar.bz2 1073613 RMD160 c94b73f53189026684a98aaa0ee301680fa54a92 SHA1 1dcdbb2fd77641edfb222fa9aad6efa1eaff9895 SHA256 a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
+EBUILD gnome-shell-3.0.2.ebuild 3742 RMD160 5339abfd4bea5f28d77d0c62c5f3e9efb5268756 SHA1 141af1c0e6790de20f37d271cf0a325de2b14072 SHA256 feedbed09de9eb44cb5bcb15e1822aa46ddd4d31d520dee86e14828b9e181f70
+EBUILD gnome-shell-9999.ebuild 3520 RMD160 a060f7d14ec659f7f49c3b4e5a9b313ba2c90ad6 SHA1 11a3d6d70ea5f5712e3230c86d37b3eb6005f880 SHA256 64bf988cb7479400c57b60ba3afccbb9b28d391a857b821659385855f103ae09
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
new file mode 100644
index 00000000..adae1f0c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
@@ -0,0 +1,33 @@
+From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 24 May 2011 22:15:10 -0400
+Subject: [PATCH] gdm: ignore user-removed signals for untracked users
+
+If we don't know about a user, we don't care if it goes away,
+and we shouldn't try to remove it from the book keeping.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647893
+---
+ src/gdmuser/gdm-user-manager.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
+index e7ca833..561be32 100644
+--- a/src/gdmuser/gdm-user-manager.c
++++ b/src/gdmuser/gdm-user-manager.c
+@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy,
+ 
+         user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path);
+ 
++        if (user == NULL) {
++                g_debug ("GdmUserManager: ignoring untracked user %s", object_path);
++                return;
++        } else {
++                g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path);
++        }
++
+         manager->priv->new_users = g_slist_remove (manager->priv->new_users, user);
+ 
+         remove_user (manager, user);
+-- 
+1.7.5.1
\ No newline at end of file
diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.1-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
index 195ff416..c442b196 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.0.1-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
@@ -7,15 +7,13 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches-0.1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -68,7 +66,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 2. Introspection stuff + dconf needed via imports.gi.*
 # 3. gnome-session is needed for gnome-session-quit
 # 4. Control shell settings
-# 5. nm-applet is needed for auth prompting and the wireless connection dialog
+# 5. accountsservice is needed for GdmUserManager
+# 6. nm-applet is needed for auth prompting and the wireless connection dialog
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -81,9 +80,11 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-2.91
 	>=gnome-base/gnome-control-center-2.91.92-r1
 
+	>=sys-apps/accountsservice-0.6.12
+
 	nm-applet? (
-		>=gnome-extra/nm-applet-0.8.997
-		>=net-misc/networkmanager-0.8.997[introspection] )"
+		>=gnome-extra/nm-applet-0.8.999
+		>=net-misc/networkmanager-0.8.999[introspection] )"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22
@@ -103,7 +104,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=647893
+	# can trigger the crash even with accountsservice-0.6.12
+	epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch"
 	gnome2_src_prepare
 }
 
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index ba5b1b53..10ac8921 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -66,7 +66,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 2. Introspection stuff + dconf needed via imports.gi.*
 # 3. gnome-session is needed for gnome-session-quit
 # 4. Control shell settings
-# 5. nm-applet is needed for auth prompting and the wireless connection dialog
+# 5. accountsservice is needed for GdmUserManager
+# 6. nm-applet is needed for auth prompting and the wireless connection dialog
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
@@ -79,9 +80,11 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-2.91
 	>=gnome-base/gnome-control-center-2.91.92-r1
 
+	>=sys-apps/accountsservice-0.6.12
+
 	nm-applet? (
-		>=gnome-extra/nm-applet-0.8.997
-		>=net-misc/networkmanager-0.8.997[introspection] )"
+		>=gnome-extra/nm-applet-0.8.999
+		>=net-misc/networkmanager-0.8.999[introspection] )"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22