Prevent segfault on alpha

4 files changed, 86 insertions, 1 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 44442197bf16..f64dcfeeac7a 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.23 2003/02/04 12:55:00 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.24 2003/02/06 21:44:27 agriffis Exp $
+
+*gnome-session-2.0.9-r1 (06 Feb 2003)
+
+  06 Feb 2003; Aron Griffis <agriffis@gentoo.org> gnome-session-2.0.9-r1.ebuild, files/gnome-session-2.0.9-64bit.patch :
+  Add patch to prevent segfault on alpha when running gnome-session-properties
 
 *gnome-session-2.2.0.2 (04 Feb 2003)
 
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.0.9-r1 b/gnome-base/gnome-session/files/digest-gnome-session-2.0.9-r1
new file mode 100644
index 000000000000..98c3e5f1b690
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.0.9-r1
@@ -0,0 +1 @@
+MD5 55659ab1dbcc521ded652aadc309287d gnome-session-2.0.9.tar.bz2 80602
diff --git a/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch b/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch
new file mode 100644
index 000000000000..fb778fab9b43
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.0.9-64bit.patch
@@ -0,0 +1,26 @@
+--- gnome-session-2.0.9/gnome-session/gsm-client-editor.c	2002-05-22 15:43:54.000000000 -0400
++++ gnome-session-2.0.9/gnome-session/gsm-client-editor.c.new	2003-02-06 16:10:05.000000000 -0500
+@@ -68,10 +68,10 @@
+   (GtkClassInitFunc) NULL
+ };
+ 
+-guint
++GtkType
+ gsm_client_editor_get_type (void)
+ {
+-  static guint type = 0;
++  static GtkType type = 0;
+ 
+   if (!type)
+     type = gtk_type_unique (gtk_hbox_get_type (), &gsm_client_editor_info);
+--- gnome-session-2.0.9/gnome-session/gsm-client-editor.h	1999-03-18 10:11:50.000000000 -0500
++++ gnome-session-2.0.9/gnome-session/gsm-client-editor.h.new	2003-02-06 16:09:56.000000000 -0500
+@@ -47,7 +47,7 @@
+ 		    guint order, GsmStyle style);    /* user change */
+ };
+ 
+-guint gsm_client_editor_get_type  (void);
++GtkType gsm_client_editor_get_type (void);
+ 
+ /* Creates a client_editor widget */
+ GtkWidget* gsm_client_editor_new (void);
diff --git a/gnome-base/gnome-session/gnome-session-2.0.9-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..f3feb796bdb5
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.0.9-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.0.9-r1.ebuild,v 1.1 2003/02/06 21:44:27 agriffis Exp $
+
+inherit gnome2 eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the Gnome2 session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=media-sound/esound-0.2.26
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2.0.4
+	>=sys-devel/gettext-0.10.40
+	>=sys-apps/tcp-wrappers-7.6
+	>=gnome-base/gconf-1.2.1"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.22
+	!gnome-base/gnome-core"
+
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+
+DOC="AUTHORS COPY* README HACKING INSTALL NEWS TODO ChangeLog"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${PN}-2.0-defaults.patch
+
+	# This patch is only necessary on 64-bit platforms such as Alpha
+	# but it doesn't hurt elsewhere.
+	epatch ${FILESDIR}/${PN}-2.0.9-64bit.patch
+}
+
+src_install() {
+	gnome2_src_install
+	
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+}
+
+
+
+