diff options
author | wiz <wiz@pkgsrc.org> | 2011-12-21 13:02:10 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-12-21 13:02:10 +0000 |
commit | c75a479d284c65921393c16d5ffff312c77b4982 (patch) | |
tree | eaa29b4711c2d8bec9527d0e086faa8b116c18d0 /wm/waimea | |
parent | ba0edeb0ac513272727ddd1e39cf332c4a1c1a97 (diff) | |
download | pkgsrc-c75a479d284c65921393c16d5ffff312c77b4982.tar.gz |
Fix build with gcc-4.5.
Diffstat (limited to 'wm/waimea')
-rw-r--r-- | wm/waimea/distinfo | 5 | ||||
-rw-r--r-- | wm/waimea/patches/patch-src_Resources.cc | 33 | ||||
-rw-r--r-- | wm/waimea/patches/patch-src_Resources.hh | 63 | ||||
-rw-r--r-- | wm/waimea/patches/patch-src_Window.cc | 23 |
4 files changed, 123 insertions, 1 deletions
diff --git a/wm/waimea/distinfo b/wm/waimea/distinfo index 4820c72ffa3..309f502c08f 100644 --- a/wm/waimea/distinfo +++ b/wm/waimea/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.3 2009/07/07 19:34:24 joerg Exp $ +$NetBSD: distinfo,v 1.4 2011/12/21 13:02:10 wiz Exp $ SHA1 (waimea-0.4.0.tar.gz) = b2dc5e829aad8681bab9313bd336b79875154531 RMD160 (waimea-0.4.0.tar.gz) = 5694d832cb3cd51d6f3473c73eb70f803825c1a3 Size (waimea-0.4.0.tar.gz) = 242526 bytes SHA1 (patch-aa) = f6cdb4054bb3f86f90a942cbaaad3a46bd42c6e2 +SHA1 (patch-src_Resources.cc) = 4190dc1cd288fed8a3d3d217ba51e2bdee229cbd +SHA1 (patch-src_Resources.hh) = 6f273e42d362e87413cab68cdd42d9e2277ffdaf +SHA1 (patch-src_Window.cc) = 3a42d1015bb343191c4ad2f1ef42e61a2650a87e diff --git a/wm/waimea/patches/patch-src_Resources.cc b/wm/waimea/patches/patch-src_Resources.cc new file mode 100644 index 00000000000..61dac550b03 --- /dev/null +++ b/wm/waimea/patches/patch-src_Resources.cc @@ -0,0 +1,33 @@ +$NetBSD: patch-src_Resources.cc,v 1.1 2011/12/21 13:02:10 wiz Exp $ + +Avoid conflict with list<>. + +--- src/Resources.cc.orig 2002-11-06 11:55:10.000000000 +0000 ++++ src/Resources.cc +@@ -1568,7 +1568,7 @@ void ResourceHandler::LoadActions(WaScre + NULL); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->rlist, wascreen); + } + else if (str[0] == 'n' && str[1] == '/') { + for (i3 = 2; str[i3] != '\0' && +@@ -1583,7 +1583,7 @@ void ResourceHandler::LoadActions(WaScre + NULL); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->rlist, wascreen); + } + else if (str[0] == 't' && str[1] == '/') { + for (i3 = 2; str[i3] != '\0' && +@@ -1598,7 +1598,7 @@ void ResourceHandler::LoadActions(WaScre + str + 2); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->rlist, wascreen); + } + else if (! strncasecmp(str, "window", 6)) { + str = str + 6; diff --git a/wm/waimea/patches/patch-src_Resources.hh b/wm/waimea/patches/patch-src_Resources.hh new file mode 100644 index 00000000000..449665cb698 --- /dev/null +++ b/wm/waimea/patches/patch-src_Resources.hh @@ -0,0 +1,63 @@ +$NetBSD: patch-src_Resources.hh,v 1.1 2011/12/21 13:02:10 wiz Exp $ + +Avoid conflict with list<>. + +--- src/Resources.hh.orig 2002-11-06 11:55:10.000000000 +0000 ++++ src/Resources.hh +@@ -40,24 +40,24 @@ typedef struct _ButtonStyle ButtonStyle; + + #define IS_ENV_CHAR(ch) (isalnum(ch) || ch == '_') + +-#define ACTLISTCLEAR(list) \ +- while (! list.empty()) { \ +- if (list.back()->exec) \ +- delete [] list.back()->exec; \ +- if (list.back()->param) \ +- delete [] list.back()->param; \ +- delete list.back(); \ +- list.pop_back(); \ ++#define ACTLISTCLEAR(rlist) \ ++ while (! rlist.empty()) { \ ++ if (rlist.back()->exec) \ ++ delete [] rlist.back()->exec; \ ++ if (rlist.back()->param) \ ++ delete [] rlist.back()->param; \ ++ delete rlist.back(); \ ++ rlist.pop_back(); \ + } + +-#define ACTLISTPTRCLEAR(list) \ +- while (! list->empty()) { \ +- if (list->back()->exec) \ +- delete [] list->back()->exec; \ +- if (list->back()->param) \ +- delete [] list->back()->param; \ +- delete list->back(); \ +- list->pop_back(); \ ++#define ACTLISTPTRCLEAR(rlist) \ ++ while (! rlist->empty()) { \ ++ if (rlist->back()->exec) \ ++ delete [] rlist->back()->exec; \ ++ if (rlist->back()->param) \ ++ delete [] rlist->back()->param; \ ++ delete rlist->back(); \ ++ rlist->pop_back(); \ + } + + +@@ -193,13 +193,13 @@ public: + delete name; + delete cl; + delete title; +- ACTLISTCLEAR(list); ++ ACTLISTCLEAR(rlist); + } + + Regex *name; + Regex *cl; + Regex *title; +- list<WaAction *> list; ++ list<WaAction *> rlist; + }; + + class StrComp { diff --git a/wm/waimea/patches/patch-src_Window.cc b/wm/waimea/patches/patch-src_Window.cc new file mode 100644 index 00000000000..d31af5276d0 --- /dev/null +++ b/wm/waimea/patches/patch-src_Window.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-src_Window.cc,v 1.1 2011/12/21 13:02:10 wiz Exp $ + +Avoid conflict with list<>. + +--- src/Window.cc.orig 2002-11-06 11:55:10.000000000 +0000 ++++ src/Window.cc +@@ -280,13 +280,13 @@ list <WaAction *> *WaWindow::GetActionLi + if (classhint) { + if (classhint->res_name && + (*it)->name->Match(classhint->res_name)) +- return &((*it)->list); ++ return &((*it)->rlist); + else if (classhint->res_class && + (*it)->cl->Match(classhint->res_class)) +- return &((*it)->list); ++ return &((*it)->rlist); + } + if ((*it)->title->Match(name)) +- return &((*it)->list); ++ return &((*it)->rlist); + } + return NULL; + } |