fix bug 33609

5 files changed, 108 insertions, 3 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index eae44fd1d100..34a67afd9ddb 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.32 2003/10/27 14:11:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.33 2003/11/16 23:39:42 agriffis Exp $
+
+*sawfish-1.3-r3 (16 Nov 2003)
+
+  16 Nov 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild,
+  files/sawfish-1.3-state-below.patch:
+  Fix bug 33609: Correct a typo in the sawfish code that prevents gdesklets (and
+  other programs) from occupying the correct layer. Without this patch, any
+  program using the _NET_WM_STATE_BELOW hint will always stay on top instead of
+  on bottom.
 
 *sawfish-1.3-r2 (27 Oct 2003)
 
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index cf96ed4d9b7b..d546892c1526 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -3,9 +3,9 @@ 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 1cf40cbc9390cc195751d8147e6fb5ed sawfish-1.3-r1.ebuild 2041
-MD5 ab5d5bb29ea62cf3d368f7269a4dcaf5 ChangeLog 5762
+MD5 cbf1eca6874ce3fc6e59710b6fabefa8 ChangeLog 5762
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4495371ff7331299dfed8310a8f25ef7 sawfish-1.3-r3.ebuild 2412
+MD5 502e67d7b04a102bf2a649b223685348 sawfish-1.3-r3.ebuild 2412
 MD5 1b22d28366b43da7e3cb86ddc4ef4c1e sawfish-1.0.1-r5.ebuild 2013
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3-r3 b/x11-wm/sawfish/files/digest-sawfish-1.3-r3
new file mode 100644
index 000000000000..329b7f1c34ed
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3-r3
@@ -0,0 +1 @@
+MD5 9e5ce5e76c60acecdb1889c1f173295a sawfish-1.3.tar.gz 1582279
diff --git a/x11-wm/sawfish/files/sawfish-1.3-state-below.patch b/x11-wm/sawfish/files/sawfish-1.3-state-below.patch
new file mode 100644
index 000000000000..78e8e29f1df4
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.3-state-below.patch
@@ -0,0 +1,11 @@
+--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl	2003-11-16 16:13:33.000000000 +0100
++++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl	2003-03-16 21:56:48.000000000 +0100
+@@ -125,7 +125,7 @@
+      _NET_WM_WINDOW_TYPE_UTILITY
+      _NET_WM_WINDOW_TYPE_SPLASH])
+   
+-  (defvar wm-spec-below-depth -2)
++  (defvar wm-spec-below-depth +2)
+   (defvar wm-spec-above-depth +2)
+ 
+   (define supported-states '())
diff --git a/x11-wm/sawfish/sawfish-1.3-r3.ebuild b/x11-wm/sawfish/sawfish-1.3-r3.ebuild
new file mode 100644
index 000000000000..e840823eab1a
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3-r3.ebuild
@@ -0,0 +1,84 @@
+# 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-r3.ebuild,v 1.1 2003/11/16 23:39:42 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
+
+	# Bug 31660: Add ability to shade windows of type
+	# _NET_WM_WINDOW_TYPE_UTILITY, _NET_WM_WINDOW_TYPE_MENU, and
+	# _NET_WM_WINDOW_TYPE_TOOLBAR
+	epatch ${FILESDIR}/sawfish-1.3-shading.patch
+
+	# Bug 33609: Correct a typo in the sawfish code that prevents
+	# gdesklets (and other programs) from occupying the correct layer
+	epatch ${FILESDIR}/sawfish-1.3-state-below.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
+}