From 336b34fca9a7a5b40f4a67b0f708b4675051df85 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Apr 13 2005 17:51:30 +0000 Subject: Repaired this one and noticed that package ownership is unclear as this was imported from fedora.us testing. Wed Apr 13 2005 Michael Schwendt - 0.9.9-4 - Fix build for GCC 4. --- diff --git a/fluxbox-0.9.9-gcc4.patch b/fluxbox-0.9.9-gcc4.patch new file mode 100644 index 0000000..908ed09 --- /dev/null +++ b/fluxbox-0.9.9-gcc4.patch @@ -0,0 +1,12 @@ +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:: ++template <> string FbTk::Resource:: + getString() { + switch (m_value) { + case Toolbar::TOPLEFT: diff --git a/fluxbox.spec b/fluxbox.spec index 671339a..e9df7dd 100644 --- a/fluxbox.spec +++ b/fluxbox.spec @@ -1,6 +1,6 @@ Name: fluxbox Version: 0.9.9 -Release: 3 +Release: 4 Summary: Window Manager based on Blackbox @@ -16,6 +16,7 @@ Source4: artwiz-aleczapka.tar.bz2 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 @@ Have a look at the homepage for more info ;) %setup -q %patch0 -p1 -b .UTF-8 %patch1 -p1 -b .gcc34 +%patch2 -p1 -b .gcc4 + %build @@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka %changelog +* Wed Apr 13 2005 Michael Schwendt - 0.9.9-4 +- Fix build for GCC 4. + * Fri Apr 7 2005 Michael Schwendt - rebuilt