> http://build-failures.rhaalovely.net/powerpc/2019-07-29/x11/waimea.log > http://build-failures.rhaalovely.net/sparc64/2019-08-12/x11/waimea.log
There is a clash between std::list and the "list" class member. I've just renamed that member and its instances. It builds [0] and works fine on macppc, and amd64 is not broken. While here WANTLIB needed a refresh, and i moved HOMEPAGE to https. OK? Charlène. [0] https://bin.charlenew.xyz/waimea.log Index: Makefile =================================================================== RCS file: /cvs/ports/x11/waimea/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile 12 Jul 2019 20:51:23 -0000 1.26 +++ Makefile 15 Aug 2019 09:56:07 -0000 @@ -4,21 +4,20 @@ COMMENT= virtual desktop manager for X1 VERSION= 0.4.0 DISTNAME= waimea-${VERSION} -REVISION = 9 +REVISION= 10 CATEGORIES= x11 -HOMEPAGE= http://www.freedesktop.org/wiki/Software/waimea +HOMEPAGE= https://www.freedesktop.org/wiki/Software/waimea # GPLv2 PERMIT_PACKAGE= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/} +WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xft Xinerama Xrandr +WANTLIB += Xrender c m -WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xrandr Xrender -WANTLIB += c expat fontconfig freetype m ${COMPILER_LIBCXX} -WANTLIB += xcb z +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/} -COMPILER = base-clang ports-gcc base-gcc +COMPILER= base-clang ports-gcc AUTOCONF_VERSION= 2.52 CONFIGURE_STYLE= autoconf Index: patches/patch-src_Resources_cc =================================================================== RCS file: patches/patch-src_Resources_cc diff -N patches/patch-src_Resources_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Resources_cc 15 Aug 2019 09:56:07 -0000 @@ -0,0 +1,35 @@ +$OpenBSD$ + +ports-gcc fix for: +error: changes meaning of 'list' from 'class std::__cxx11::list<_WaAction*>' + +Index: src/Resources.cc +--- src/Resources.cc.orig ++++ src/Resources.cc +@@ -1568,7 +1568,7 @@ void ResourceHandler::LoadActions(WaScreen *wascreen) + NULL); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->alist, wascreen); + } + else if (str[0] == 'n' && str[1] == '/') { + for (i3 = 2; str[i3] != '\0' && +@@ -1583,7 +1583,7 @@ void ResourceHandler::LoadActions(WaScreen *wascreen) + NULL); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->alist, wascreen); + } + else if (str[0] == 't' && str[1] == '/') { + for (i3 = 2; str[i3] != '\0' && +@@ -1598,7 +1598,7 @@ void ResourceHandler::LoadActions(WaScreen *wascreen) + str + 2); + str = str + i3 + 1; + ReadActions((char *) buffer2, defs, &wacts, +- &ext_list->list, wascreen); ++ &ext_list->alist, wascreen); + } + else if (! strncasecmp(str, "window", 6)) { + str = str + 6; Index: patches/patch-src_Resources_hh =================================================================== RCS file: patches/patch-src_Resources_hh diff -N patches/patch-src_Resources_hh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Resources_hh 15 Aug 2019 09:56:07 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +ports-gcc fix for: +error: changes meaning of 'list' from 'class std::__cxx11::list<_WaAction*>' + +Index: src/Resources.hh +--- src/Resources.hh.orig ++++ src/Resources.hh +@@ -193,13 +193,13 @@ class WaActionExtList { (public) + delete name; + delete cl; + delete title; +- ACTLISTCLEAR(list); ++ ACTLISTCLEAR(alist); + } + + Regex *name; + Regex *cl; + Regex *title; +- list<WaAction *> list; ++ list<WaAction *> alist; + }; + + class StrComp { Index: patches/patch-src_Window_cc =================================================================== RCS file: patches/patch-src_Window_cc diff -N patches/patch-src_Window_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Window_cc 15 Aug 2019 09:56:07 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ + +ports-gcc fix for: +error: changes meaning of 'list' from 'class std::__cxx11::list<_WaAction*>' + +Index: src/Window.cc +--- src/Window.cc.orig ++++ src/Window.cc +@@ -280,13 +280,13 @@ list <WaAction *> *WaWindow::GetActionList(list<WaActi + if (classhint) { + if (classhint->res_name && + (*it)->name->Match(classhint->res_name)) +- return &((*it)->list); ++ return &((*it)->alist); + else if (classhint->res_class && + (*it)->cl->Match(classhint->res_class)) +- return &((*it)->list); ++ return &((*it)->alist); + } + if ((*it)->title->Match(name)) +- return &((*it)->list); ++ return &((*it)->alist); + } + return NULL; + }
