From owner-svn-ports-head@freebsd.org Thu Sep 21 23:26:47 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 325FDE29D19; Thu, 21 Sep 2017 23:26:47 +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 mx1.freebsd.org (Postfix) with ESMTPS id F2FFD6FB9C; Thu, 21 Sep 2017 23:26:46 +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 v8LNQk1n003521; Thu, 21 Sep 2017 23:26:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LNQkm1003520; Thu, 21 Sep 2017 23:26:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201709212326.v8LNQkm1003520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 21 Sep 2017 23:26:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450309 - head/games/simutrans/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/simutrans/files X-SVN-Commit-Revision: 450309 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2017 23:26:47 -0000 Author: jbeich Date: Thu Sep 21 23:26:45 2017 New Revision: 450309 URL: https://svnweb.freebsd.org/changeset/ports/450309 Log: games/simutrans: unbreak with libc++ 5.0 In file included from squirrel/squirrel/sqvm.cc:5: In file included from /usr/include/c++/v1/math.h:310: /usr/include/c++/v1/limits:233:91: error: member reference base type 'int' is not a structure or union _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);} ^~~~~~~ squirrel/squirrel/sqobject.h:131:25: note: expanded from macro 'type' #define type(obj) ((obj)._type) ~~~~~^~~~~~ PR: 222402 Submitted by: chardon.frederic@gmail.com Reported by: pkg-fallout Added: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp (contents, props changed) - copied, changed from r450308, head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp Copied and modified: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp (from r450308, head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp) ============================================================================== --- head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp Thu Sep 21 21:18:50 2017 (r450308, copy source) +++ head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp Thu Sep 21 23:26:45 2017 (r450309) @@ -1,13 +1,12 @@ ---- src/3rdparty/squirrel/squirrel/sqvm.cpp.orig 2017-06-13 18:34:58 UTC -+++ src/3rdparty/squirrel/squirrel/sqvm.cpp -@@ -4,9 +4,9 @@ - - #include "../../../stdafx.h" - -+#include - #include - #include "sqpcheader.h" --#include - #include "sqopcodes.h" - #include "sqfuncproto.h" - #include "sqvm.h" +--- squirrel/squirrel/sqvm.cc.orig 2017-02-17 12:54:05 UTC ++++ squirrel/squirrel/sqvm.cc +@@ -1,8 +1,8 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include ++#include "sqpcheader.h" + #include + #include + #include "sqopcodes.h"