Newer snapshot

(Portage version: 2.1.1_pre5-r1)

5 files changed, 163 insertions, 1 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 15223a9d9714..2b625ae113cd 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.65 2006/06/15 20:32:59 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.66 2006/08/16 08:08:07 truedfx Exp $
+
+*sawfish-1.3.20060816 (16 Aug 2006)
+
+  16 Aug 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/sawfish-configure-warning.patch, +files/sawfish-kde-menus.patch,
+  +sawfish-1.3.20060816.ebuild:
+  Newer snapshot, with patch for KDE menus
 
   15 Jun 2006; Harald van Dijk <truedfx@gentoo.org>
   sawfish-1.3.20040120.ebuild, sawfish-1.3.20040120-r1.ebuild,
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20060816 b/x11-wm/sawfish/files/digest-sawfish-1.3.20060816
new file mode 100644
index 000000000000..99ef81836870
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3.20060816
@@ -0,0 +1,3 @@
+MD5 af0087d24dee707c16308b2a5733c8bd sawfish-1.3.20060816.tar.bz2 1172610
+RMD160 a4f02524f398c5de8e09e6148621dd42aca90a7d sawfish-1.3.20060816.tar.bz2 1172610
+SHA256 81672a37c0e1a27ef14588808bb005c155876c3d4394f1edc251ceaa300d2798 sawfish-1.3.20060816.tar.bz2 1172610
diff --git a/x11-wm/sawfish/files/sawfish-configure-warning.patch b/x11-wm/sawfish/files/sawfish-configure-warning.patch
new file mode 100644
index 000000000000..2f3c55c3c080
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-configure-warning.patch
@@ -0,0 +1,20 @@
+--- sawfish/configure.in
++++ sawfish/configure.in
+@@ -90,7 +90,7 @@
+ _cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+ 
+-AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h)
++AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h,,,[#include <X11/Xlib.h>])
+ 
+ dnl Checks for X extensions/libraries
+ XINERAMA_LIBS=""
+@@ -110,7 +110,7 @@
+ 
+ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+ 	     [XRANDR_LIBS="-lXrandr"
+-	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h)],
++	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h,,,[#include <X11/Xlib.h>])],
+ 	     [],[$X_LIBS -lX11 -lXext])
+ 
+ dnl Try using pkg-config first, since it looks like Xft2 may fail our
diff --git a/x11-wm/sawfish/files/sawfish-kde-menus.patch b/x11-wm/sawfish/files/sawfish-kde-menus.patch
new file mode 100644
index 000000000000..5e3e2125a4b0
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-kde-menus.patch
@@ -0,0 +1,22 @@
+This patch comes from sawfish-mmc. Without it, opening
+a menu in KDE deactivates the current window.
+
+--- sawfish/src/events.c
++++ sawfish/src/events.c
+@@ -955,11 +955,15 @@
+     Lisp_Window *w = find_window_by_id (ev->xfocus.window);
+     if (ev->xfocus.detail == NotifyPointer)
+ 	return;
++    if (ev->xfocus.mode == NotifyGrab || ev->xfocus.mode == NotifyUngrab)
++	return;
+     if (w != 0 && ev->xfocus.detail != NotifyInferior)
+     {
+ 	if (focus_window == w)
+ 	{
+-	    focus_window = 0;
++	    if (ev->xfocus.mode == NotifyNormal || ev->xfocus.mode == NotifyWhileGrabbed)
++		focus_window = 0;
++
+ 	    report_focus_change (w);
+ 	}
+ 
diff --git a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
new file mode 100644
index 000000000000..de565960fe9b
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20060816.ebuild,v 1.1 2006/08/16 08:08:07 truedfx Exp $
+
+# detect cvs snapshots; fex. 1.3.20040120
+[[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
+(( snapshot = !$? ))
+
+inherit eutils
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+if (( snapshot )); then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else
+	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gnome esd nls audiofile pango"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=x11-libs/rep-gtk-0.17
+	>=dev-libs/librep-0.16
+	>=x11-libs/gtk+-2.0.8
+	audiofile? ( >=media-libs/audiofile-0.2.3 )
+	esd? ( >=media-sound/esound-0.2.23 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
+
+if (( snapshot )); then
+	DEPEND="${DEPEND}
+		sys-devel/automake
+		sys-devel/autoconf"
+	S="${WORKDIR}/${PN}"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/libtool.patch"
+	# Fix configure warning about being unable
+	# to compile with <Xdbe.h> and <Xrandr.h>
+	epatch "${FILESDIR}"/sawfish-configure-warning.patch
+	# Fix utf8 with xft #121772
+	epatch "${FILESDIR}"/sawfish-xft-menu-utf8.patch
+	# Fix KDE menus
+	epatch "${FILESDIR}"/sawfish-kde-menus.patch
+}
+
+src_compile() {
+	# 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"
+
+	# If this is a snapshot then we need to create the autoconf stuff
+	if (( snapshot )); then
+		aclocal || die "aclocal failed"
+		autoconf || die "autoconf failed"
+	fi
+
+	set -- \
+		--disable-themer \
+		--with-gdk-pixbuf \
+		$(use_with audiofile) \
+		$(use_with esd) \
+		$(use_with pango)
+
+	if use gnome; then
+		set -- "$@" \
+			--with-gnome-prefix=/usr \
+			--enable-gnome-widgets \
+			--enable-capplet
+	else
+		set -- "$@" \
+			--disable-gnome-widgets \
+			--disable-capplet
+	fi
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas="" as
+		# "install everything"
+		# Don't use --disable-linguas, because that means --enable-linguas="no",
+		# which means "install Norwegian translations"
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@" || die "configure failed"
+
+	# 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 "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+	newdoc src/ChangeLog ChangeLog.src
+}