Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 27 Aug 2018 17:29:28 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478238 - in head/games/keeperrl: . files
Message-ID:  <201808271729.w7RHTSVK020675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Mon Aug 27 17:29:28 2018
New Revision: 478238
URL: https://svnweb.freebsd.org/changeset/ports/478238

Log:
  games/keeperrl: unbreak on FreeBSD 10
  
  stdafx.h:94:20: error: redefinition of 'unique'
  std::unique_ptr<T> unique(Args&&... args) { return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); }
                     ^
  stdafx.h:94:20: note: previous definition is here
  std::unique_ptr<T> unique(Args&&... args) { return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); }
                     ^
  stack_printer.cpp:329:18: error: assigning to 'char *' from incompatible type 'void *'
        ss.ss_sp = (void*)alternate_stack;
                   ^~~~~~~~~~~~~~~~~~~~~~

Added:
  head/games/keeperrl/files/patch-stack__printer.cpp   (contents, props changed)
Modified:
  head/games/keeperrl/Makefile   (contents, props changed)

Modified: head/games/keeperrl/Makefile
==============================================================================
--- head/games/keeperrl/Makefile	Mon Aug 27 17:29:03 2018	(r478237)
+++ head/games/keeperrl/Makefile	Mon Aug 27 17:29:28 2018	(r478238)
@@ -16,12 +16,10 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.txt
 LICENSE_FILE_OFL11=	${WRKSRC}/data_contrib/SIL_Open_Font_License.txt
 
-BROKEN_FreeBSD_10=	needs c++14, does not build even with clang5
-
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libcurl.so:ftp/curl
 
-USES=		gmake localbase openal
+USES=		compiler:c++14-lang gmake localbase openal
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	miki151

Added: head/games/keeperrl/files/patch-stack__printer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/keeperrl/files/patch-stack__printer.cpp	Mon Aug 27 17:29:28 2018	(r478238)
@@ -0,0 +1,20 @@
+https://svnweb.freebsd.org/changeset/base/294930
+
+stack_printer.cpp:329:18: error: assigning to 'char *' from incompatible type 'void *'
+      ss.ss_sp = (void*)alternate_stack;
+                 ^~~~~~~~~~~~~~~~~~~~~~
+
+--- stack_printer.cpp.orig	2017-10-24 09:45:42 UTC
++++ stack_printer.cpp
+@@ -326,7 +326,11 @@ int printStacktraceWithGdb() {
+       stack_t ss = {};
+       /* malloc is usually used here, I'm not 100% sure my static allocation
+          is valid but it seems to work just fine. */
++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11)
++      ss.ss_sp = (char*)alternate_stack;
++#else
+       ss.ss_sp = (void*)alternate_stack;
++#endif
+       ss.ss_size = SIGSTKSZ;
+       ss.ss_flags = 0;
+

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808271729.w7RHTSVK020675>