Upstream bugfix #2 added. Closes bug #2517.

7 files changed, 116 insertions, 70 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index ac21dbf18bbb..41bb8c14b2bd 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2002/04/30 00:27:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.11 2002/05/14 20:34:10 g2boojum Exp $
+
+*fluxbox-0.18-r2 (14 May 2002)
+
+  14 May 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Upstream bugfix patch (#2) applied.  Old 0.1.8 versions removed.
 
 *fluxbox-0.18-r1 (29 Apr 2002)
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8
deleted file mode 100644
index 3867ab39b943..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78516d88b9fd91f80ab1062ce80fe944 fluxbox-0.1.8.tar.gz 437076
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1
deleted file mode 100644
index 3867ab39b943..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78516d88b9fd91f80ab1062ce80fe944 fluxbox-0.1.8.tar.gz 437076
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r2
new file mode 100644
index 000000000000..9c82bb5b36ce
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.8-r2
@@ -0,0 +1,3 @@
+MD5 78516d88b9fd91f80ab1062ce80fe944 fluxbox-0.1.8.tar.gz 437076
+MD5 9f381526357889e14b0fa4e7d6bd8462 fluxbox-0.1.8-bugfix1.patch 1876
+MD5 43e9d0d8b6d2a9b0769e8c3fbc33b505 fluxbox-0.1.8-bugfix2.patch 3295
diff --git a/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch
new file mode 100644
index 000000000000..914b21de21d2
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-0.1.8-bugfix2.patch
@@ -0,0 +1,100 @@
+Only in fluxbox-0.1.8-bugfix2/: fluxbox-0.1.8-bugfix1.patch
+diff -U 1 -r fluxbox-0.1.8/src/Configmenu.cc fluxbox-0.1.8-bugfix2/src/Configmenu.cc
+--- fluxbox-0.1.8/src/Configmenu.cc	Fri Apr 12 17:14:09 2002
++++ fluxbox-0.1.8-bugfix2/src/Configmenu.cc	Fri May  3 10:41:09 2002
+@@ -197,2 +197,4 @@
+ 			}
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 		}
+@@ -292,2 +294,6 @@
+ 
++			//save resources
++			Fluxbox::instance()->save_rc();
++			
++			//toggle options
+ 			setItemSelected(0, !(configmenu->screen->isSloppyFocus() || 
+@@ -429,2 +435,4 @@
+ 			}
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 		}
+@@ -640,3 +648,4 @@
+ 			}
+-
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 			Fluxbox::instance()->reconfigureTabs(); //TODO
+diff -U 1 -r fluxbox-0.1.8/src/Tab.cc fluxbox-0.1.8-bugfix2/src/Tab.cc
+--- fluxbox-0.1.8/src/Tab.cc	Mon Apr 15 00:27:57 2002
++++ fluxbox-0.1.8-bugfix2/src/Tab.cc	Fri May  3 10:44:18 2002
+@@ -65,3 +65,4 @@
+ 			m_win->getScreen()->getTabPlacement() == PRIGHT) &&
+-			m_win->getScreen()->isTabRotateVertical()) {
++			m_win->getScreen()->isTabRotateVertical() &&
++			!m_win->isShaded()) {
+ 		m_size_w = m_win->getScreen()->getTabHeight();
+diff -U 1 -r fluxbox-0.1.8/src/Window.cc fluxbox-0.1.8-bugfix2/src/Window.cc
+--- fluxbox-0.1.8/src/Window.cc	Wed Apr 17 09:24:59 2002
++++ fluxbox-0.1.8-bugfix2/src/Window.cc	Fri May  3 10:34:31 2002
+@@ -241,4 +241,5 @@
+ 	if (transient) {
+-		decorations.maximize = decorations.handle =
+-			decorations.border = functions.maximize = false;
++		decorations.maximize =  functions.maximize = false;
++		//we can still use the handles to resize it
++		decorations.handle = decorations.border = true;
+ 	}	
+diff -U 1 -r fluxbox-0.1.8/src/fluxbox.cc fluxbox-0.1.8-bugfix2/src/fluxbox.cc
+--- fluxbox-0.1.8/src/fluxbox.cc	Sat Apr 20 12:10:48 2002
++++ fluxbox-0.1.8-bugfix2/src/fluxbox.cc	Fri May  3 10:47:20 2002
+@@ -1703,3 +1703,2 @@
+ 
+-	save_rc();
+ }
+diff -U 1 -r fluxbox-0.1.8/src/fluxbox.hh fluxbox-0.1.8-bugfix2/src/fluxbox.hh
+--- fluxbox-0.1.8/src/fluxbox.hh	Fri Apr 12 15:02:12 2002
++++ fluxbox-0.1.8-bugfix2/src/fluxbox.hh	Fri May  3 10:46:28 2002
+@@ -137,2 +137,3 @@
+ 	void saveGroupSearch(Window, FluxboxWindow *);	
++	void save_rc(void);
+ 	void removeMenuSearch(Window);
+@@ -242,3 +243,2 @@
+ 	void load_rc(void);
+-	void save_rc(void);
+ 	void reload_rc(void);
+diff -U 1 -r fluxbox-0.1.8/src/Toolbar.cc fluxbox-0.1.8-bugfix/src/Toolbar.cc
+--- fluxbox-0.1.8/src/Toolbar.cc	Wed Apr 10 01:16:28 2002
++++ fluxbox-0.1.8-bugfix/src/Toolbar.cc	Fri May  3 14:48:51 2002
+@@ -1170,3 +1170,3 @@
+ 			screen->getWorkspacemenu()->update();
+-
++			Fluxbox::instance()->save_rc();
+ 			reconfigure();
+@@ -1314,5 +1314,7 @@
+ 			toolbar->on_top = change;
+-				setItemSelected(1, change);
++			screen()->saveToolbarOnTop(toolbar->on_top);
++			setItemSelected(1, change);
+ 
+ 			if (toolbar->isOnTop()) toolbar->screen->raiseWindows((Window *) 0, 0);
++			
+ 			break;
+@@ -1324,2 +1326,3 @@
+ 	toolbar->do_auto_hide = change;
++	screen()->saveToolbarAutoHide(toolbar->do_auto_hide);
+ 	setItemSelected(2, change);
+@@ -1338,2 +1341,3 @@
+ 		}
++		Fluxbox::instance()->save_rc();
+ 	}
+@@ -1417,3 +1421,3 @@
+ #endif // SLIT
+-
++		Fluxbox::instance()->save_rc();
+ 	}
+@@ -1461,3 +1465,3 @@
+ #endif // SLIT
+-
++		Fluxbox::instance()->save_rc();
+ 	}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.1.8-r2.ebuild
index 5de25d93ea2c..bd5b9fb0ae36 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.8-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.8-r2.ebuild
@@ -1,11 +1,13 @@
 # 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.3 2002/04/30 04:35:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.8-r2.ebuild,v 1.1 2002/05/14 20:34:10 g2boojum Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
+		 http://fluxbox.sourceforge.net/download/patches/${P}-bugfix1.patch
+		 http://fluxbox.sourceforge.net/download/patches/${P}-bugfix2.patch"
 HOMEPAGE="http://fluxbox.sf.net"
 
 DEPEND="virtual/x11"
@@ -16,7 +18,8 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-bugfix1.patch || die
+	patch -p1 < ${DISTDIR}/${P}-bugfix1.patch || die
+	patch -p1 < ${DISTDIR}/${P}-bugfix2.patch || die
 }
 
 PROVIDE="virtual/blackbox"
diff --git a/x11-wm/fluxbox/fluxbox-0.1.8.ebuild b/x11-wm/fluxbox/fluxbox-0.1.8.ebuild
deleted file mode 100644
index deec232bf74b..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.ebuild,v 1.1 2002/04/19 18:42:52 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/fluxbox/fluxbox-${PV}.tar.gz"
-HOMEPAGE="http://fluxbox.sf.net"
-
-DEPEND="virtual/x11"
-	
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	patch -p1 < ${DISTDIR}/${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
-}