hopefully fixes the capplet crashes

3 files changed, 108 insertions, 0 deletions

diff --git a/x11-wm/sawfish/files/capplet-crash.patch b/x11-wm/sawfish/files/capplet-crash.patch
new file mode 100644
index 000000000000..2d2f19ec06cf
--- /dev/null
+++ b/x11-wm/sawfish/files/capplet-crash.patch
@@ -0,0 +1,23 @@
+--- capplet/sawmill-capplet.c.orig	Thu Jan 24 22:31:39 2002
++++ capplet/sawmill-capplet.c	Thu Jan 24 22:52:59 2002
+@@ -104,7 +104,7 @@
+ display_error (const char *message)
+ {
+     GtkWidget *label;
+-
++    
+     if (ui_handler_id != 0)
+     {
+ 	gtk_input_remove (ui_handler_id);
+@@ -119,7 +119,10 @@
+     if (ui_socket != 0)
+     {
+ 	gtk_container_remove (GTK_CONTAINER (capplet), ui_socket);
+-	gtk_object_destroy (GTK_OBJECT (ui_socket));
++	
++	if (GTK_IS_OBJECT (ui_socket)) {
++	  gtk_object_destroy (GTK_OBJECT (ui_socket));
++	}
+ 	ui_socket = 0;
+     }
+ 
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.0.1-r1 b/x11-wm/sawfish/files/digest-sawfish-1.0.1-r1
new file mode 100644
index 000000000000..d96f5e8b0fc8
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.0.1-r1
@@ -0,0 +1 @@
+MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1327104
diff --git a/x11-wm/sawfish/sawfish-1.0.1-r1.ebuild b/x11-wm/sawfish/sawfish-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..ddf66b8c9c1f
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.0.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0.1-r1.ebuild,v 1.1 2002/01/24 21:59:19 hallski Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+SRC_URI="http://prdownloads.sourceforge.net/sawmill/"${A}
+HOMEPAGE="http://sawmill.sourceforge.net/"
+
+DEPEND=">=dev-libs/rep-gtk-0.15-r1
+        >=dev-libs/librep-0.14
+	>=media-libs/imlib-1.9.10-r1
+	esd? ( >=media-sound/esound-0.2.22 )
+        readline? ( >=sys-libs/readline-4.1 )
+        nls? ( sys-devel/gettext )
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
+                 >=gnome-base/gnome-core-1.4.0.4-r1 )"
+
+RDEPEND=">=dev-libs/rep-gtk-0.15-r1
+        >=dev-libs/librep-0.14
+        >=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/imlib-1.9.10-r1
+	esd? ( >=media-sound/esound-0.2.22 )
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
+                 >=gnome-base/gnome-core-1.4.0.4-r1 )"
+
+src_unpack() {
+        unpack ${A}
+#        cd ${S}/po
+#        cp zh_TW.Big5.po zh_TW.Big5.po.orig
+#        sed -e "s:\\\::g" zh_TW.Big5.po.orig > zh_TW.Big5.po
+#        rm zh_TW.Big5.po.orig
+
+	cd ${S}
+	patch -p0 < ${FILESDIR}/capplet-crash.patch
+}
+
+src_compile() {
+
+  	local myconf
+        if [ "`use esd`" ]
+        then
+          myconf="--with-esd"
+        else
+          myconf="--without-esd"
+        fi
+        if [ "`use gnome`" ]
+        then
+          myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"
+        else
+          myconf="${myconf} --disable-gnome-widgets --disable-capplet --without-gdk-pixbuf"
+        fi
+        if [ "`use readline`" ]
+        then
+          myconf="${myconf} --with-readline"
+        else
+          myconf="${myconf} --without-readline"
+        fi
+        if [ -z "`use nls`" ]
+        then
+          myconf="${myconf} --disable-linguas"
+        fi
+
+ 	try ./configure --host=${CHOST} --prefix=/usr --infodir=/usr/share/info --libexecdir=/usr/lib --with-audiofile ${myconf}
+
+	#pmake doesn't work, stick with make
+	try make
+}
+
+src_install() {
+
+  try make DESTDIR=${D} install
+  dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO
+
+  # Add to Gnome CC's Window Manager list
+  insinto /usr/share/gnome/wm-properties
+  doins ${FILESDIR}/Sawfish.desktop
+
+}
+
+
+