mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Fix build with gcc-3.2

Browse Source 
Portlint

PR:		ports/69782
Submitted by:	Craig Rodrigues <rodrigc@crodrigues.org>
This commit is contained in:
Kirill Ponomarev 2004-07-30 15:22:55 +00:00
parent 3bd4278bd2
commit 02c11edf66
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=115087
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11-wm/fluxbox/Makefile
View File

@ -7,14 +7,14 @@
PORTNAME= fluxbox
PORTVERSION= 0.1.14
PORTREVISION= 2
PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
.if defined(WITH_REMEMBER)
PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/
PATCH_DIST_STRIP= -p1
PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/
PATCH_DIST_STRIP= -p1
PATCHFILES= remember-0.1.14-7.gz
.endif
@ -49,9 +49,9 @@ CONFIGURE_ARGS+= --enable-xinerama
.endif
.if defined(WITH_WINSNAP)
PATCH_SITES+= http://www.raisdorf.net/files/FreeBSD/
PATCH_DIST_STRIP= -p1
PATCHFILES+= winsnap-0.1.14.patch
PATCH_SITES+= http://www.raisdorf.net/files/FreeBSD/
PATCH_DIST_STRIP= -p1
PATCHFILES+= winsnap-0.1.14.patch
.endif
MAN1= fluxbox.1

41
x11-wm/fluxbox/files/patch-src-Resource.hh Normal file
View File

@ -0,0 +1,41 @@
--- src/Resource.hh.orig Thu Jul 29 21:04:30 2004
+++ src/Resource.hh Thu Jul 29 21:22:14 2004
@@ -66,16 +66,9 @@
{
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
- }
+ const std::string &name, const std::string &altname);
+
+ virtual ~Resource();
inline void setDefaultValue() { m_value = m_defaultval; }
void setFromString(const char *strval);
@@ -128,5 +121,18 @@
static bool m_init;
ResourceList m_resourcelist;
};
+
+template <typename T>
+Resource<T>::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
+}
+
+template <typename T>
+Resource<T>::~Resource() {
+ m_rm.removeResource(*this); // remove this from resource handler
+}
#endif //_RESOURCE_HH_