From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QS986-0007D5-Vu for garchives@archives.gentoo.org; Thu, 02 Jun 2011 14:44:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 204201C008; Thu, 2 Jun 2011 14:43:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C98021C02E for ; Thu, 2 Jun 2011 14:43:08 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DF501B4030 for ; Thu, 2 Jun 2011 14:43:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 76C4F80510 for ; Thu, 2 Jun 2011 14:43:07 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch gnome-base/gnome-shell/gnome-shell-3.0.1-r2.ebuild gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: ae871665493d7dbd965a703d3958ffc786c8e17f Date: Thu, 2 Jun 2011 14:43:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 897c9def718a3c345f1973162568f29e commit: ae871665493d7dbd965a703d3958ffc786c8e17f Author: Alexandre Rostovtsev gmail com> AuthorDate: Sun May 29 21:17:35 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Thu Jun 2 14:07:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dae871665 gnome-base/gnome-shell: 3.0.1-r2 =E2=86=92 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 gentoo.org> --- .../gnome-shell-3.0.2-user-removed-signals.patch | 33 ++++++++++++++= ++++++ ...ll-3.0.1-r2.ebuild =3D> gnome-shell-3.0.2.ebuild} | 17 ++++++---- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 9 +++-- 3 files changed, 49 insertions(+), 10 deletions(-) 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-remov= ed-signals.patch new file mode 100644 index 0000000..adae1f0 --- /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 +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=3D647893 +--- + 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-manag= er.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 *pr= oxy, +=20 + user =3D g_hash_table_lookup (manager->priv->users_by_object_pa= th, object_path); +=20 ++ if (user =3D=3D 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 =3D g_slist_remove (manager->priv->new= _users, user); +=20 + remove_user (manager, user); +--=20 +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-b= ase/gnome-shell/gnome-shell-3.0.2.ebuild similarity index 88% rename from gnome-base/gnome-shell/gnome-shell-3.0.1-r2.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild index 195ff41..c442b19 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=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.5" =20 -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi =20 DESCRIPTION=3D"Provides core UI functions for the GNOME 3 desktop" HOMEPAGE=3D"http://live.gnome.org/GnomeShell" -SRC_URI=3D"${SRC_URI} - mirror://gentoo/${P}-patches-0.1.tar.xz" =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -68,7 +66,8 @@ COMMON_DEPEND=3D">=3Ddev-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=3D"${COMMON_DEPEND} >=3Dsys-auth/polkit-0.101[introspection] =20 @@ -81,9 +80,11 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91.92-r1 =20 + >=3Dsys-apps/accountsservice-0.6.12 + nm-applet? ( - >=3Dgnome-extra/nm-applet-0.8.997 - >=3Dnet-misc/networkmanager-0.8.997[introspection] )" + >=3Dgnome-extra/nm-applet-0.8.999 + >=3Dnet-misc/networkmanager-0.8.999[introspection] )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 @@ -103,7 +104,9 @@ pkg_setup() { } =20 src_prepare() { - EPATCH_SUFFIX=3D"patch" epatch "${WORKDIR}" + # https://bugzilla.gnome.org/show_bug.cgi?id=3D647893 + # can trigger the crash even with accountsservice-0.6.12 + epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch" gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index ba5b1b5..10ac892 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=3D">=3Ddev-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=3D"${COMMON_DEPEND} >=3Dsys-auth/polkit-0.101[introspection] =20 @@ -79,9 +80,11 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91.92-r1 =20 + >=3Dsys-apps/accountsservice-0.6.12 + nm-applet? ( - >=3Dgnome-extra/nm-applet-0.8.997 - >=3Dnet-misc/networkmanager-0.8.997[introspection] )" + >=3Dgnome-extra/nm-applet-0.8.999 + >=3Dnet-misc/networkmanager-0.8.999[introspection] )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22