From owner-svn-ports-all@freebsd.org Mon Aug 27 17:29:29 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CE0F10916EB; Mon, 27 Aug 2018 17:29:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 102037B771; Mon, 27 Aug 2018 17:29:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E705920B60; Mon, 27 Aug 2018 17:29:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7RHTSkN020677; Mon, 27 Aug 2018 17:29:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7RHTSVK020675; Mon, 27 Aug 2018 17:29:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808271729.w7RHTSVK020675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 27 Aug 2018 17:29:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478238 - in head/games/keeperrl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/games/keeperrl: . files X-SVN-Commit-Revision: 478238 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 17:29:29 -0000 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 unique(Args&&... args) { return std::unique_ptr(new T(std::forward(args)...)); } ^ stdafx.h:94:20: note: previous definition is here std::unique_ptr unique(Args&&... args) { return std::unique_ptr(new T(std::forward(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; +