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

Package-Manager: portage-2.1.4_rc10

5 files changed, 91 insertions, 5 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/Manifest b/gnome-extra/fast-user-switch-applet/Manifest
index e94eefeab32a..7013a366fca4 100644
--- a/gnome-extra/fast-user-switch-applet/Manifest
+++ b/gnome-extra/fast-user-switch-applet/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fast-user-switch-applet-2.20.0-gdm-socket.patch 555 RMD160 3b5bff5435b9a2dc9e603f7cf8b64a0ae5a0e4df SHA1 3d62c76a8ec149389cf38551a5793b2620756244 SHA256 873159eb0b5a6e1a3b97e302911893d3f425c50a7ea21686502f08a4cf094e2e
+MD5 f63eee19404cd4a8c910a982d745474f files/fast-user-switch-applet-2.20.0-gdm-socket.patch 555
+RMD160 3b5bff5435b9a2dc9e603f7cf8b64a0ae5a0e4df files/fast-user-switch-applet-2.20.0-gdm-socket.patch 555
+SHA256 873159eb0b5a6e1a3b97e302911893d3f425c50a7ea21686502f08a4cf094e2e files/fast-user-switch-applet-2.20.0-gdm-socket.patch 555
 DIST fast-user-switch-applet-2.16.0.tar.bz2 682627 RMD160 dfdb7ad825f8e8999ef84052305718973714893e SHA1 7e8d9bb63fb66b698054a7c40071b4dfcfa2b58a SHA256 64a7d04867ff03f436cd06177a9d86e19f606f84cc42f108cb50298a05af3118
 DIST fast-user-switch-applet-2.18.0.tar.bz2 761628 RMD160 c8e377e6db4d698ceb2314fb826a980b556d38f6 SHA1 8bea178630ab5dc2ab4d542f76f4286dfd225b1b SHA256 eec13f4a8d35e5b43ad78589dd02c255748a3d24be8da7c018f2a7e5fcb87436
 DIST fast-user-switch-applet-2.20.0.tar.bz2 777118 RMD160 6a9ec9b65b57e8b6d5a5b943d98a64f71aad4216 SHA1 22164f9d832c52522607c8cfdf9b3a3919df220a SHA256 c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd
@@ -9,14 +16,18 @@ EBUILD fast-user-switch-applet-2.18.0.ebuild 1021 RMD160 32d3dd79dcea48891adfb9c
 MD5 a2f55392e09151776dce08f52ce105aa fast-user-switch-applet-2.18.0.ebuild 1021
 RMD160 32d3dd79dcea48891adfb9c4cb9de294c59a553d fast-user-switch-applet-2.18.0.ebuild 1021
 SHA256 8ffaf1c130a0658ef5775363cff63fc4d4e9a4cd1cfe8167c605e403dd7b7b04 fast-user-switch-applet-2.18.0.ebuild 1021
+EBUILD fast-user-switch-applet-2.20.0-r1.ebuild 1125 RMD160 c39bd70dd63b0c752f60361a7a858efdb8acdae0 SHA1 a70c547bafab67850fe1345f54e5e60527b8658e SHA256 ae32eceee8348ef2a5b532746eaf804447b4069ba1ee26be3ef51fed2c8722c1
+MD5 e0fea191ce91286ab3a366af8e68e7d5 fast-user-switch-applet-2.20.0-r1.ebuild 1125
+RMD160 c39bd70dd63b0c752f60361a7a858efdb8acdae0 fast-user-switch-applet-2.20.0-r1.ebuild 1125
+SHA256 ae32eceee8348ef2a5b532746eaf804447b4069ba1ee26be3ef51fed2c8722c1 fast-user-switch-applet-2.20.0-r1.ebuild 1125
 EBUILD fast-user-switch-applet-2.20.0.ebuild 1018 RMD160 b43a83eafa0b95411fb544d113c735d0bf3bb94a SHA1 ebc2f358723b711d65e3e07186458312b96f90d7 SHA256 eae72471188285115039a831f1133f4a5f89cb353297085c75c858305914511b
 MD5 c489721af1aa0a9073ddc591c64efd14 fast-user-switch-applet-2.20.0.ebuild 1018
 RMD160 b43a83eafa0b95411fb544d113c735d0bf3bb94a fast-user-switch-applet-2.20.0.ebuild 1018
 SHA256 eae72471188285115039a831f1133f4a5f89cb353297085c75c858305914511b fast-user-switch-applet-2.20.0.ebuild 1018
-MISC ChangeLog 6700 RMD160 01e2d7e6ad6c02b49392434fef97d257097bdf66 SHA1 1d83d5bc2f679c83b359187cee16f9f9c13d3360 SHA256 6a2c80186780870fc45b8ee43a750e29be6844be1360975507b6feb4f01259c2
-MD5 916ab46962bdda1cf4d6150c786da2b6 ChangeLog 6700
-RMD160 01e2d7e6ad6c02b49392434fef97d257097bdf66 ChangeLog 6700
-SHA256 6a2c80186780870fc45b8ee43a750e29be6844be1360975507b6feb4f01259c2 ChangeLog 6700
+MISC ChangeLog 6912 RMD160 1a30032d8572a8b759137178e20d795cd799acb6 SHA1 7ce81fee827e8cc8cb94293f45d781abf345b3b0 SHA256 5de3be3cf3477f65db14869df73910956549dd11d5d08ae795c2020718b889ef
+MD5 4de4b1265f13d0e7fc34735b79c4301a ChangeLog 6912
+RMD160 1a30032d8572a8b759137178e20d795cd799acb6 ChangeLog 6912
+SHA256 5de3be3cf3477f65db14869df73910956549dd11d5d08ae795c2020718b889ef ChangeLog 6912
 MISC metadata.xml 159 RMD160 4aba844314249b872aefa0ef14d652f127e6334f SHA1 210583dd46159c21ce4f3289960d5014ce57e01a SHA256 d6e10a30ac9423eb5a9ba4e7b2a76322683f40b2fb428d2f310dcdbd1cfde235
 MD5 8b0560553235cfd96801898935f8ff94 metadata.xml 159
 RMD160 4aba844314249b872aefa0ef14d652f127e6334f metadata.xml 159
@@ -30,3 +41,13 @@ SHA256 e170d0dcfa152f5209faa59729135a6b6fffbf96d9d4e5b34ceed70226528720 files/di
 MD5 2a1c8e81089cdc525596972f7028de64 files/digest-fast-user-switch-applet-2.20.0 295
 RMD160 15d98748e63d56577f29bf94a639767fb3411bb9 files/digest-fast-user-switch-applet-2.20.0 295
 SHA256 2d7dbd9ce13c170271db1a49f438ebbe0fbf27e624c84f23460cbcd958fa2bae files/digest-fast-user-switch-applet-2.20.0 295
+MD5 2a1c8e81089cdc525596972f7028de64 files/digest-fast-user-switch-applet-2.20.0-r1 295
+RMD160 15d98748e63d56577f29bf94a639767fb3411bb9 files/digest-fast-user-switch-applet-2.20.0-r1 295
+SHA256 2d7dbd9ce13c170271db1a49f438ebbe0fbf27e624c84f23460cbcd958fa2bae files/digest-fast-user-switch-applet-2.20.0-r1 295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHZFng1fmVwcYIWAYRAmyIAJ9s4xka3Lj7KlX0a2qrsvO31MoBDwCg4WJB
++5aD9wynD6xdrvavMXunLuc=
+=bXSc
+-----END PGP SIGNATURE-----
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!");