From owner-svn-ports-all@freebsd.org Mon Jul 30 11:05:20 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 2AAC0105264E; Mon, 30 Jul 2018 11:05:20 +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 D443893BCB; Mon, 30 Jul 2018 11:05:19 +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 B17012378D; Mon, 30 Jul 2018 11:05:19 +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 w6UB5JWf075400; Mon, 30 Jul 2018 11:05:19 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6UB5JnZ075399; Mon, 30 Jul 2018 11:05:19 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807301105.w6UB5JnZ075399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 30 Jul 2018 11:05:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475879 - in head/games/warmux: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/warmux: . files X-SVN-Commit-Revision: 475879 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, 30 Jul 2018 11:05:20 -0000 Author: tobik Date: Mon Jul 30 11:05:18 2018 New Revision: 475879 URL: https://svnweb.freebsd.org/changeset/ports/475879 Log: games/warmux: Fix build with Clang 6 interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type 'Weapon *' with an rvalue of type 'bool' return false; ^~~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/warmux-11.04.1_9.log map/tile.cpp:676:30: error: non-constant-expression cannot be narrowed from type 'uint' (aka 'unsigned int') to 'uint16_t' (aka 'unsigned short') in initializer list [-Wc++11-narrowing] SynchTileInfo info = { i, t->GetSynchsum() }; ^ Added: head/games/warmux/files/patch-src_interface_weapon__menu.cpp (contents, props changed) Modified: head/games/warmux/Makefile Modified: head/games/warmux/Makefile ============================================================================== --- head/games/warmux/Makefile Mon Jul 30 10:07:28 2018 (r475878) +++ head/games/warmux/Makefile Mon Jul 30 11:05:18 2018 (r475879) @@ -19,10 +19,13 @@ LIB_DEPENDS= libxml++-2.6.so:textproc/libxml++26 \ GNU_CONFIGURE= yes CONFIGURE_ENV= cxx_present=yes -USES= dos2unix gmake pkgconfig tar:bzip2 +USES= compiler dos2unix gmake pkgconfig tar:bzip2 USE_SDL= sdl image mixer ttf gfx net DOS2UNIX_GLOB= fixed_class.h +# build ignores CXXFLAGS +CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} +CFLAGS_clang= -Wno-c++11-narrowing WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:R} OPTIONS_DEFINE= FRIBIDI SERVER NLS DEBUG Added: head/games/warmux/files/patch-src_interface_weapon__menu.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/warmux/files/patch-src_interface_weapon__menu.cpp Mon Jul 30 11:05:18 2018 (r475879) @@ -0,0 +1,15 @@ +interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type 'Weapon *' with an rvalue of type 'bool' + return false; + ^~~~~ + +--- src/interface/weapon_menu.cpp.orig 2018-07-30 10:50:34 UTC ++++ src/interface/weapon_menu.cpp +@@ -391,7 +391,7 @@ void WeaponsMenu::Draw() + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return NULL; + const std::vector& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);