Include shading patch submitted by David Reid in bug 31660

4 files changed, 108 insertions, 3 deletions

diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 957c2ef78108..bcb1ebeae5b3 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,10 +1,9 @@
 MD5 74bd84edc07a51201cb558490fda957a sawfish-1.3.ebuild 2241
-MD5 340911c549948e88b1f03eee92f88227 sawfish-1.3-r2.ebuild 2127
+MD5 912a38d9daeef09c925d30b1a7ecb6fc sawfish-1.3-r2.ebuild 2127
 MD5 b340c65f9f8a378aff72ff032f9280f5 sawfish-1.2.ebuild 2223
 MD5 12589c6a3a29aa851c46dbdd6aa47f51 sawfish-1.0.1-r6.ebuild 2050
-MD5 7fbd0cb641d1062373293197e322b6a1 x.c.patch 48144
 MD5 1cf40cbc9390cc195751d8147e6fb5ed sawfish-1.3-r1.ebuild 2041
-MD5 ba4a9a5b406bd724712eaaee3a528edf ChangeLog 5167
+MD5 7584d8ff1f8a0edb0683dfe6aedd7d5c ChangeLog 5368
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1b22d28366b43da7e3cb86ddc4ef4c1e sawfish-1.0.1-r5.ebuild 2013
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3-r2 b/x11-wm/sawfish/files/digest-sawfish-1.3-r2
new file mode 100644
index 000000000000..329b7f1c34ed
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3-r2
@@ -0,0 +1 @@
+MD5 9e5ce5e76c60acecdb1889c1f173295a sawfish-1.3.tar.gz 1582279
diff --git a/x11-wm/sawfish/files/sawfish-1.3-shading.patch b/x11-wm/sawfish/files/sawfish-1.3-shading.patch
new file mode 100644
index 000000000000..43ac247f7903
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.3-shading.patch
@@ -0,0 +1,28 @@
+diff -r -u -x '*.jlc' -x .cvsignore sawfish-1.3_orig/lisp/sawfish/wm/frames.jl sawfish-1.3/lisp/sawfish/wm/frames.jl
+--- sawfish-1.3_orig/lisp/sawfish/wm/frames.jl	2002-10-20 01:07:50.000000000 -0700
++++ sawfish-1.3/lisp/sawfish/wm/frames.jl	2003-10-20 12:46:41.000000000 -0700
+@@ -155,8 +155,11 @@
+       (icon . shaped-transient)
+       (dock . icon)
+       (utility . transient)
++      (shaded-utility . shaded-transient)
+       (toolbar . utility)
++      (shaded-toolbar . shaded-utility)
+       (menu . utility)
++      (shaded-menu . shaded-utility)
+       (splash . unframed))
+     "Frame type fallbacks.")
+ 
+diff -r -u -x '*.jlc' -x .cvsignore sawfish-1.3_orig/lisp/sawfish/wm/state/shading.jl sawfish-1.3/lisp/sawfish/wm/state/shading.jl
+--- sawfish-1.3_orig/lisp/sawfish/wm/state/shading.jl	2003-10-20 04:27:06.000000000 -0700
++++ sawfish-1.3/lisp/sawfish/wm/state/shading.jl	2003-10-20 04:26:28.000000000 -0700
+@@ -83,6 +83,9 @@
+ 	(case type
+ 	  ((default shaped) 'shaded)
+ 	  ((transient shaped-transient) 'shaded-transient)
++	  ((utility shaped-utility) 'shaded-utility)
++	  ((menu shaped-menu) 'shaded-menu)
++	  ((toolbar shaped-toolbar) 'shaded-toolbar)
+ 	  (t type))
+       type))
+ 
diff --git a/x11-wm/sawfish/sawfish-1.3-r2.ebuild b/x11-wm/sawfish/sawfish-1.3-r2.ebuild
new file mode 100644
index 000000000000..aac336fa40c9
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3-r2.ebuild,v 1.1 2003/10/27 14:11:46 agriffis Exp $
+
+inherit base eutils gnuconfig
+
+IUSE="gnome readline esd nls"
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 alpha"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=x11-libs/rep-gtk-0.17
+	=dev-libs/librep-0.16*
+	>=media-libs/imlib-1.9.10-r1
+	media-libs/audiofile
+	>=x11-libs/gtk+-2.0.8
+	esd? ( >=media-sound/esound-0.2.22 )
+	readline? ( >=sys-libs/readline-4.1 )
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
+
+
+src_unpack() {
+	base_src_unpack
+	use alpha && gnuconfig_update
+	# See bug 31660 for the following patch
+	epatch ${FILESDIR}/sawfish-1.3-shading.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	myconf="${myconf} `use_with esd`"
+	myconf="${myconf} `use_with readline`"
+	use nls || myconf="${myconf} --disable-linguas"
+
+	if use gnome; then
+		myconf="${myconf} --with-gnome-prefix=/usr \
+			--enable-gnome-widgets --enable-capplet"
+	else
+		myconf="${myconf} --disable-gnome-widgets --disable-capplet"
+	fi
+
+	# Make sure we include freetype2 headers before freetype1 headers,
+	# else Xft2 borks, <azarah@gentoo.org> (13 Dec 2002)
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
+
+	econf \
+		--enable-themer \
+		--with-gdk-pixbuf \
+		--with-audiofile \
+		${myconf} || die
+
+	# The following two lines allow sawfish to compile with gcc 2.95
+	# (see bug 18294)
+	sed -i -e 's:REP_CFLAGS=:REP_CFLAGS=-I/usr/include/freetype2 :' Makedefs
+
+	# Parallel build doesn't work
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+
+	# Add to Gnome CC's Window Manager list
+	if use gnome; then
+		insinto /usr/share/gnome/wm-properties
+		doins ${S}/Sawfish.desktop
+	fi
+}