devel/fluxbox fluxbox-0.9.9-gcc4.patch, NONE, 1.1 fluxbox.spec, 1.8, 1.9

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/fluxbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20464

Modified Files:
	fluxbox.spec 
Added Files:
	fluxbox-0.9.9-gcc4.patch 
Log Message:
Repaired this one and noticed that package ownership is unclear
as this was imported from fedora.us testing.

* Wed Apr 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-4
- Fix build for GCC 4.



fluxbox-0.9.9-gcc4.patch:

--- NEW FILE fluxbox-0.9.9-gcc4.patch ---
diff -Nur fluxbox-0.9.9-orig/src/Toolbar.cc fluxbox-0.9.9/src/Toolbar.cc
--- fluxbox-0.9.9-orig/src/Toolbar.cc	2004-01-21 14:36:09.000000000 +0100
+++ fluxbox-0.9.9/src/Toolbar.cc	2005-04-13 19:47:43.000000000 +0200
@@ -101,7 +101,7 @@
         setDefaultValue();
 }
 
-string FbTk::Resource<Toolbar::Placement>::
+template <> string FbTk::Resource<Toolbar::Placement>::
 getString() {
     switch (m_value) {
     case Toolbar::TOPLEFT:


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/devel/fluxbox/fluxbox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fluxbox.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ fluxbox.spec	13 Apr 2005 17:51:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		fluxbox
 Version:	0.9.9
-Release:	3
+Release:	4
 
 Summary:	Window Manager based on Blackbox
 
@@ -16,6 +16,7 @@
 
 Patch0: fluxbox-0.9.9.startfluxbox-UTF-8.patch
 Patch1: fluxbox-0.9.9-gcc34.patch
+Patch2: fluxbox-0.9.9-gcc4.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	XFree86-devel
@@ -38,6 +39,8 @@
 %setup -q
 %patch0 -p1 -b .UTF-8
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .gcc4
+
 
 %build
 
@@ -115,6 +118,9 @@
 %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Wed Apr 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-4
+- Fix build for GCC 4.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt