upstream bugfix

5 files changed, 123 insertions, 3 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index d4eb091d078f..ac21dbf18bbb 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.9 2002/04/19 18:42:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.10 2002/04/30 00:27:41 seemant Exp $
+
+*fluxbox-0.18-r1 (29 Apr 2002)
+
+  29 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.8-r1.ebuild.
+  files/fluxbox-0.18-bugfix1.patch, files/diges-fluxbox-0.1.8-r1 :
+
+  Upstream bugfix patch applied.
 
 *fluxbox-0.18 (19 Apr 2002)
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1
new file mode 100644
index 000000000000..3867ab39b943
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1
@@ -0,0 +1 @@
+MD5 78516d88b9fd91f80ab1062ce80fe944 fluxbox-0.1.8.tar.gz 437076
diff --git a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch
new file mode 100644
index 000000000000..936683d5a6fd
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix1.patch
@@ -0,0 +1,48 @@
+diff -U 1 -r fluxbox-0.1.8/src/Font.cc fluxbox-0.1.8-bugfix/src/Font.cc
+--- fluxbox-0.1.8/src/Font.cc	Wed Mar 27 19:47:44 2002
++++ fluxbox-0.1.8-bugfix/src/Font.cc	Fri Apr 26 19:27:47 2002
+@@ -27,2 +27,4 @@
+ #include "StringUtil.hh"
++#include "i18n.hh"
++
+ //use gnu extensions
+@@ -55,2 +57,3 @@
+ 	m_font.set = 0;
++	m_multibyte = I18n::instance()->multibyte();
+ 	if (name!=0) {
+diff -U 1 -r fluxbox-0.1.8/src/Theme.cc fluxbox-0.1.8-bugfix/src/Theme.cc
+--- fluxbox-0.1.8/src/Theme.cc	Thu Apr  4 13:28:19 2002
++++ fluxbox-0.1.8-bugfix/src/Theme.cc	Fri Apr 26 19:33:32 2002
+@@ -384,3 +384,3 @@
+ 	m_menustyle.framefont->loadFromDatabase(m_database, "menu.frame.font", "Menu.Frame.Font");
+-	m_menustyle.titlefont->loadFromDatabase(m_database, "menu.Title.font", "Menu.Title.Font");
++	m_menustyle.titlefont->loadFromDatabase(m_database, "menu.title.font", "Menu.Title.Font");
+ 	/*
+diff -U 1 -r fluxbox-0.1.8/src/Window.cc fluxbox-0.1.8-bugfix/src/Window.cc
+--- fluxbox-0.1.8/src/Window.cc	Wed Apr 17 09:24:59 2002
++++ fluxbox-0.1.8-bugfix/src/Window.cc	Fri Apr 26 19:57:18 2002
+@@ -3350,3 +3350,3 @@
+ 					const int warpPad = screen->getEdgeSnapThreshold();
+-					if (me->x_root >= int(screen->getWidth()) - warpPad &&
++					if (me->x_root >= int(screen->getWidth()) - warpPad - 1 &&
+ 							frame.x < int(me->x_root - frame.grab_x - screen->getBorderWidth())) {
+diff -U 1 -r fluxbox-0.1.8/src/i18n.hh fluxbox-0.1.8-bugfix/src/i18n.hh
+--- fluxbox-0.1.8/src/i18n.hh	Thu Apr  4 12:16:59 2002
++++ fluxbox-0.1.8-bugfix/src/i18n.hh	Fri Apr 26 19:40:46 2002
+@@ -31,2 +31,5 @@
+ 
++#ifdef    HAVE_CONFIG_H
++#  include "../config.h"
++#endif // HAVE_CONFIG_H
+ #ifdef		HAVE_LOCALE_H
+@@ -35,7 +38,8 @@
+ 
+-#ifdef		HAVE_NL_TYPES_H
++#ifdef	HAVE_NL_TYPES_H
+ // this is needed for linux libc5 systems
+ extern "C" {
+-#	include <nl_types.h>
++#       include <nl_types.h>
+ }
++
+ #endif // HAVE_NL_TYPES_H
diff --git a/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild
index 96c56f643eef..b58a76ce26ac 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild,v 1.6 2002/04/12 20:23:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.7-r3.ebuild,v 1.7 2002/04/30 00:27:41 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
@@ -16,7 +16,7 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	patch -p1 < ${DISTDIR}/${P}-bugfix1.patch
+	patch -p1 < ${FILESDIR}/${P}-bugfix1.patch
 }
 
 PROVIDE="virtual/blackbox"
diff --git a/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..4968e68ca081
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild,v 1.1 2002/04/30 00:27:41 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Window manager based on BlackBox"
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
+HOMEPAGE="http://fluxbox.sf.net"
+
+DEPEND="virtual/x11"
+	
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-bugfix1.patch
+}
+
+PROVIDE="virtual/blackbox"
+
+src_compile() {
+	local myconf
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
+		&& export KDEDIR=/usr/kde/2 \
+		|| myconf="${myconf} --disable-kde"
+
+	use gnome \
+		&& myconf="${myconf} --enable-gnome" \
+		|| myconf="${myconf} --disable-gnome"
+	 
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$myconf || die
+
+	emake || die
+}
+
+src_install () {
+	make \
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc/X11/fluxbox \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
+	docinto data
+	dodoc data/README*
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/fluxbox" > ${D}/etc/X11/Sessions/fluxbox
+	chmod +x ${D}/etc/X11/Sessions/fluxbox
+}