diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-07-30 15:22:55 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-07-30 15:22:55 +0000 |
| commit | 02c11edf66f91be669b628aeac6db101b63a74f6 (patch) | |
| tree | 72f2d67fd9e2798481412b19af4c737531644ba9 /x11-wm/fluxbox | |
| parent | Update to 1.15 (diff) | |
Fix build with gcc-3.2
Portlint
PR: ports/69782
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org>
Notes
Notes:
svn path=/head/; revision=115087
Diffstat (limited to 'x11-wm/fluxbox')
| -rw-r--r-- | x11-wm/fluxbox/Makefile | 12 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/patch-src-Resource.hh | 41 |
2 files changed, 47 insertions, 6 deletions
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 2227e09d6143..6f253629616c 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -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 diff --git a/x11-wm/fluxbox/files/patch-src-Resource.hh b/x11-wm/fluxbox/files/patch-src-Resource.hh new file mode 100644 index 000000000000..7e854873b332 --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src-Resource.hh @@ -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_ |