rpms/fbdesk/devel fbdesk-1.1.5-gcc34.patch, NONE, 1.1 fbdesk.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

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

Modified Files:
	fbdesk.spec 
Added Files:
	fbdesk-1.1.5-gcc34.patch 
Log Message:
Fix build for GCC 3.4.

fbdesk-1.1.5-gcc34.patch:

--- NEW FILE fbdesk-1.1.5-gcc34.patch ---
diff -Nur fbdesk-1.1.5-orig/src/Resource.hh fbdesk-1.1.5/src/Resource.hh
--- fbdesk-1.1.5-orig/src/Resource.hh	2003-01-14 22:45:53.000000000 +0100
+++ fbdesk-1.1.5/src/Resource.hh	2004-11-17 18:08:14.000000000 +0100
@@ -56,41 +56,9 @@
     std::string m_altname; ///< alternative name 
 };
 
+template<typename T> class Resource;
 class ResourceManager;
 
-/**
-	Real resource class
-*/
-template <typename T>
-class Resource:public Resource_base
-{
-public:	
-    Resource(ResourceManager &rm, T val, 
-             const std::string &name, const std::string &altname):
-	Resource_base(name, altname),
-	m_value(val), m_defaultval(val),
-	m_rm(rm)
-	{
-            m_rm.addResource(*this); // add this to resource handler
-	}
-    virtual ~Resource() {
-        m_rm.removeResource(*this); // remove this from resource handler
-    }
-
-    inline void setDefaultValue() {  m_value = m_defaultval; }
-    void setFromString(const char *strval);
-    inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue;  return *this;}
-	
-    std::string getString();	
-    inline T& operator*() { return m_value; }
-    inline const T& operator*() const { return m_value; }
-    inline T *operator->() { return &m_value; }
-    inline const T *operator->() const { return &m_value; }
-private:
-    T m_value, m_defaultval;
-    ResourceManager &m_rm;
-};
-
 class ResourceManager
 {
 public:
@@ -129,4 +97,37 @@
     ResourceList m_resourcelist;
 };
 
+/**
+	Real resource class
+*/
+template <typename T>
+class Resource:public Resource_base
+{
+public:	
+    Resource(ResourceManager &rm, T val, 
+             const std::string &name, const std::string &altname):
+	Resource_base(name, altname),
+	m_value(val), m_defaultval(val),
+	m_rm(rm)
+	{
+            m_rm.addResource(*this); // add this to resource handler
+	}
+    virtual ~Resource() {
+        m_rm.removeResource(*this); // remove this from resource handler
+    }
+
+    inline void setDefaultValue() {  m_value = m_defaultval; }
+    void setFromString(const char *strval);
+    inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue;  return *this;}
+	
+    std::string getString();	
+    inline T& operator*() { return m_value; }
+    inline const T& operator*() const { return m_value; }
+    inline T *operator->() { return &m_value; }
+    inline const T *operator->() const { return &m_value; }
+private:
+    T m_value, m_defaultval;
+    ResourceManager &m_rm;
+};
+
 #endif //_RESOURCE_HH_


Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fbdesk.spec	8 Nov 2004 04:16:38 -0000	1.4
+++ fbdesk.spec	17 Nov 2004 17:10:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           fbdesk
 Version:        1.1.5
-Release:        0.fdr.3.2
+Release:        4
 Epoch:          0
 Summary:        Icon Manager for Fluxbox
 
@@ -8,6 +8,7 @@
 License:        MIT 
 URL:            http://fluxbox.sourceforge.net
 Source0:        http://fluxbox.sourceforge.net/download/fbdesk-1.1.5.tar.gz
+Patch:          fbdesk-1.1.5-gcc34.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  XFree86-devel
 BuildRequires:  freetype-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .gcc34
 
 
 %build
@@ -47,6 +49,9 @@
 
 
 %changelog
+* Wed Nov 17 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.1.5-4
+- Fix for GCC 3.4, bump release.
+
 * Mon Jul 28 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:1.1.5-0.fdr.3
 - partly applied patch provided by Michael Schwendt ( #441 #3 )