From owner-svn-ports-head@freebsd.org Sat Jul 28 08:12:08 2018 Return-Path: Delivered-To: svn-ports-head@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 20A4A1045FFC; Sat, 28 Jul 2018 08:12:08 +0000 (UTC) (envelope-from tobik@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 C9D378083E; Sat, 28 Jul 2018 08:12:07 +0000 (UTC) (envelope-from tobik@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 A72CE240EF; Sat, 28 Jul 2018 08:12:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6S8C72x045988; Sat, 28 Jul 2018 08:12:07 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6S8C6Ys045984; Sat, 28 Jul 2018 08:12:06 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807280812.w6S8C6Ys045984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 28 Jul 2018 08:12:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475510 - in head/games/simutrans: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/simutrans: . files X-SVN-Commit-Revision: 475510 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.27 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: Sat, 28 Jul 2018 08:12:08 -0000 Author: tobik Date: Sat Jul 28 08:12:06 2018 New Revision: 475510 URL: https://svnweb.freebsd.org/changeset/ports/475510 Log: games/simutrans: Fix build with Clang 6 gui/simwin.cc:503:11: error: case value evaluates to -1, which cannot be narrowed to type 'uint32' (aka 'unsigned int') [-Wc++11-narrowing] case magic_none: return; ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475044_s336572/logs/simutrans-120.2.2.log - While here apply dos2unix and fix patch line endings Added: head/games/simutrans/files/patch-squirrel_sq__extensions.cc (contents, props changed) Modified: head/games/simutrans/Makefile head/games/simutrans/files/patch-gui_loadsave__frame.h (contents, props changed) head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc (contents, props changed) Modified: head/games/simutrans/Makefile ============================================================================== --- head/games/simutrans/Makefile Sat Jul 28 07:51:21 2018 (r475509) +++ head/games/simutrans/Makefile Sat Jul 28 08:12:06 2018 (r475510) @@ -37,9 +37,12 @@ MAKE_ARGS= BACKEND=mixer_sdl \ FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \ VERBOSE=1 NO_WRKSUBDIR= yes -USES= gmake zip +USES= compiler dos2unix gmake zip USE_SDL= sdl mixer +CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +CXXFLAGS_clang= -Wno-c++11-narrowing +DOS2UNIX_GLOB= * DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" false PLIST_FILES= bin/simutrans bin/simutrans-bin PORTDATA= * Modified: head/games/simutrans/files/patch-gui_loadsave__frame.h ============================================================================== --- head/games/simutrans/files/patch-gui_loadsave__frame.h Sat Jul 28 07:51:21 2018 (r475509) +++ head/games/simutrans/files/patch-gui_loadsave__frame.h Sat Jul 28 08:12:06 2018 (r475510) @@ -1,10 +1,10 @@ ---- gui/loadsave_frame.h.orig 2017-02-17 12:53:58 UTC -+++ gui/loadsave_frame.h -@@ -11,6 +11,7 @@ - - #include "savegame_frame.h" - #include "../tpl/stringhashtable_tpl.h" -+#include - #include - - class loadsave_t; +--- gui/loadsave_frame.h.orig 2017-02-17 12:53:58 UTC ++++ gui/loadsave_frame.h +@@ -11,6 +11,7 @@ + + #include "savegame_frame.h" + #include "../tpl/stringhashtable_tpl.h" ++#include + #include + + class loadsave_t; Added: head/games/simutrans/files/patch-squirrel_sq__extensions.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/simutrans/files/patch-squirrel_sq__extensions.cc Sat Jul 28 08:12:06 2018 (r475510) @@ -0,0 +1,27 @@ +In file included from squirrel/sq_extensions.cc:6: +In file included from squirrel/../tpl/ptrhashtable_tpl.h:8: +In file included from squirrel/../tpl/hashtable_tpl.h:4: +In file included from squirrel/../tpl/slist_tpl.h:11: +In file included from /usr/include/c++/v1/iterator:417: +In file included from /usr/include/c++/v1/__functional_base:19: +/usr/include/c++/v1/utility:488:67: error: expected an identifier or template-id + after '::' + typename __make_tuple_indices::type(), + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ +squirrel/squirrel/sqobject.h:131:19: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + ^ + +--- squirrel/sq_extensions.cc.orig 2018-07-28 07:52:43 UTC ++++ squirrel/sq_extensions.cc +@@ -1,9 +1,9 @@ + #include "sq_extensions.h" + ++#include "../tpl/ptrhashtable_tpl.h" + #include "squirrel/sqpcheader.h" // for declarations... + #include "squirrel/sqvm.h" // for Raise_Error_vl + #include +-#include "../tpl/ptrhashtable_tpl.h" + + // store data associate to vm's here + struct my_vm_info_t { Modified: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc ============================================================================== --- head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc Sat Jul 28 07:51:21 2018 (r475509) +++ head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cc Sat Jul 28 08:12:06 2018 (r475510) @@ -1,12 +1,12 @@ ---- 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" +--- 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"