add an upstream patch to fix gdm socket handling, fixes bug #199941

(Portage version: 2.1.4_rc10)

4 files changed, 66 insertions, 1 deletions

diff --git a/gnome-extra/fast-user-switch-applet/ChangeLog b/gnome-extra/fast-user-switch-applet/ChangeLog
index d721bb2f0bce..653395d2cd7f 100644
--- a/gnome-extra/fast-user-switch-applet/ChangeLog
+++ b/gnome-extra/fast-user-switch-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/fast-user-switch-applet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/fast-user-switch-applet/ChangeLog,v 1.49 2007/11/29 05:56:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/fast-user-switch-applet/ChangeLog,v 1.50 2007/12/15 22:48:45 eva Exp $
+
+  15 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/fast-user-switch-applet-2.20.0-gdm-socket.patch,
+  +fast-user-switch-applet-2.20.0-r1.ebuild:
+  add an upstream patch to fix handling of gdm socket
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org>
   fast-user-switch-applet-2.20.0.ebuild:
diff --git a/gnome-extra/fast-user-switch-applet/fast-user-switch-applet-2.20.0-r1.ebuild b/gnome-extra/fast-user-switch-applet/fast-user-switch-applet-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..f1e6b31f9422
--- /dev/null
+++ b/gnome-extra/fast-user-switch-applet/fast-user-switch-applet-2.20.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/fast-user-switch-applet/fast-user-switch-applet-2.20.0-r1.ebuild,v 1.1 2007/12/15 22:48:45 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Fast User Switching Applet for Gnome Desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/glib
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.0
+	gnome-base/gconf
+	>=gnome-base/gnome-panel-2.0
+	gnome-base/gdm
+	x11-libs/libXmu
+	x11-libs/libXau
+	x11-libs/libSM"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/pkgconfig-0.9
+	>=sys-devel/autoconf-2.53
+	>=dev-util/intltool-0.35
+	>=app-text/scrollkeeper-0.1.4
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.3"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --with-gdm-config=/usr/share/gdm/defaults.conf"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix handling of gdm socket
+	epatch "${FILESDIR}/${P}-gdm-socket.patch"
+}
diff --git a/gnome-extra/fast-user-switch-applet/files/digest-fast-user-switch-applet-2.20.0-r1 b/gnome-extra/fast-user-switch-applet/files/digest-fast-user-switch-applet-2.20.0-r1
new file mode 100644
index 000000000000..387f5b68c872
--- /dev/null
+++ b/gnome-extra/fast-user-switch-applet/files/digest-fast-user-switch-applet-2.20.0-r1
@@ -0,0 +1,3 @@
+MD5 1d1fd25b5599f7656e3fa89aa913137c fast-user-switch-applet-2.20.0.tar.bz2 777118
+RMD160 6a9ec9b65b57e8b6d5a5b943d98a64f71aad4216 fast-user-switch-applet-2.20.0.tar.bz2 777118
+SHA256 c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd fast-user-switch-applet-2.20.0.tar.bz2 777118
diff --git a/gnome-extra/fast-user-switch-applet/files/fast-user-switch-applet-2.20.0-gdm-socket.patch b/gnome-extra/fast-user-switch-applet/files/fast-user-switch-applet-2.20.0-gdm-socket.patch
new file mode 100644
index 000000000000..08010c2cd86c
--- /dev/null
+++ b/gnome-extra/fast-user-switch-applet/files/fast-user-switch-applet-2.20.0-gdm-socket.patch
@@ -0,0 +1,13 @@
+Index: src/gdm-queue.c
+===================================================================
+--- src/gdm-queue.c	(revision 435)
++++ src/gdm-queue.c	(working copy)
+@@ -237,7 +237,7 @@
+ 
+         if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
+           strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
+-        if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
++        else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
+           strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
+         else
+           g_error ("Can't find gdm socket!");