rpms/fluxbox/devel fluxbox-0.9.9-gcc34.patch, NONE, 1.1 fluxbox.spec, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

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

Modified Files:
	fluxbox.spec 
Added Files:
	fluxbox-0.9.9-gcc34.patch 
Log Message:
Fix build for FC3/GCC 3.4.

fluxbox-0.9.9-gcc34.patch:

--- NEW FILE fluxbox-0.9.9-gcc34.patch ---
diff -Nur fluxbox-0.9.9-orig/src/FbTk/Resource.hh fluxbox-0.9.9/src/FbTk/Resource.hh
--- fluxbox-0.9.9-orig/src/FbTk/Resource.hh	2003-12-19 19:25:39.000000000 +0100
+++ fluxbox-0.9.9/src/FbTk/Resource.hh	2004-11-13 01:01:01.000000000 +0100
@@ -33,9 +33,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
+#include "XrmDatabaseHelper.hh"
+
 namespace FbTk {
 
-class XrmDatabaseHelper;
+//class XrmDatabaseHelper;
 
 /// Base class for resources, this is only used in ResourceManager
 class Resource_base:private FbTk::NotCopyable
diff -Nur fluxbox-0.9.9-orig/src/FbTk/Menu.cc fluxbox-0.9.9/src/FbTk/Menu.cc
--- fluxbox-0.9.9-orig/src/FbTk/Menu.cc	2004-04-20 00:47:36.000000000 +0200
+++ fluxbox-0.9.9/src/FbTk/Menu.cc	2004-11-13 01:00:36.000000000 +0100
@@ -489,9 +489,8 @@
     if (m_need_update && (m_frame_pm.width() != menu.frame.width() ||
                           m_frame_pm.height() != menu.frame.height() )){
 
-        m_frame_pm = FbTk::FbPixmap(menu.frame.window(),
-                                    menu.frame.width(), menu.frame.height(),
-                                    menu.frame.depth());
+      FbTk::FbPixmap tmp(menu.frame.window(), menu.frame.width(), menu.frame.height(), menu.frame.depth());
+      m_frame_pm = tmp;
 
         if (m_frame_pm.drawable() == 0) {
             cerr<<"FbTk::Menu: Warning: Failed to create pixmap ("<<


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fluxbox.spec	8 Nov 2004 04:19:32 -0000	1.5
+++ fluxbox.spec	13 Nov 2004 00:10:24 -0000	1.6
@@ -1,7 +1,6 @@
 Name:		fluxbox
 Version:	0.9.9
-Release:	0.fdr.1.2
-Epoch:		0
+Release:	2
 Summary:	Fluxbox is a windowmanager that is based on Blackbox.
 
 Group:          User Interface/Desktops 
@@ -15,11 +14,13 @@
 Source4: artwiz-aleczapka.tar.bz2
 
 Patch0: fluxbox-0.9.9.startfluxbox-UTF-8.patch
+Patch1: fluxbox-0.9.9-gcc34.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:	XFree86-devel
 Buildrequires: zlib-devel
-Requires(post,postun): chkfontpath
+Requires(post): chkfontpath
+Requires(postun): chkfontpath
 
 
 %description
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .UTF-8
+%patch1 -p1 -b .gcc34
 
 %build
 
@@ -112,6 +114,9 @@
 %{_prefix}/X11R6/lib/X11/fonts/artwiz-aleczapka
 
 %changelog
+* Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-2
+- Fix build for GCC 3.4.
+
 * Mon Apr 26 2004 Arnaud Abélard
 - rebuilt against Fluxbox-0.9.9