From owner-svn-ports-all@freebsd.org Mon Oct 22 20:31:04 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 EE864106CFC2; Mon, 22 Oct 2018 20:31:03 +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 A39D272129; Mon, 22 Oct 2018 20:31:03 +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 9E8F4254BD; Mon, 22 Oct 2018 20:31:03 +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 w9MKV3Vf099284; Mon, 22 Oct 2018 20:31:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9MKV3uY099283; Mon, 22 Oct 2018 20:31:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810222031.w9MKV3uY099283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 22 Oct 2018 20:31:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482790 - head/games/wesnoth/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/wesnoth/files X-SVN-Commit-Revision: 482790 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.29 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, 22 Oct 2018 20:31:04 -0000 Author: jbeich Date: Mon Oct 22 20:31:03 2018 New Revision: 482790 URL: https://svnweb.freebsd.org/changeset/ports/482790 Log: games/wesnoth: unbreak with boost 1.69 src/units/frame.cpp:463:53: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); ^~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:467:53: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); ^~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:471:56: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); ^~~~~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:775:13: error: no viable conversion from 'boost::logic::tribool' to 'const bool' const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 232525 Added: head/games/wesnoth/files/patch-boost-1.69 (contents, props changed) Added: head/games/wesnoth/files/patch-boost-1.69 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wesnoth/files/patch-boost-1.69 Mon Oct 22 20:31:03 2018 (r482790) @@ -0,0 +1,32 @@ +https://github.com/wesnoth/wesnoth/issues/3646 + +--- src/units/frame.cpp.orig 2018-09-16 07:27:00 UTC ++++ src/units/frame.cpp +@@ -460,15 +460,15 @@ std::vector frame_parsed_parameters::debu + } + + if(!boost::indeterminate(auto_vflip_)) { +- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); ++ v.emplace_back("auto_vflip=" + utils::bool_string(bool{auto_vflip_})); + } + + if(!boost::indeterminate(auto_hflip_)) { +- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); ++ v.emplace_back("auto_hflip=" + utils::bool_string(bool{auto_hflip_})); + } + + if(!boost::indeterminate(primary_frame_)) { +- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); ++ v.emplace_back("primary_frame=" + utils::bool_string(bool{primary_frame_})); + } + + if(!drawing_layer_.get_original().empty()) { +@@ -772,7 +772,7 @@ const frame_parameters unit_frame::merge_parameters(in + } + + // Convert the tribool to bool +- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); ++ const bool primary{result.primary_frame == true || boost::logic::indeterminate(result.primary_frame)}; + + /** The engine provides a default image to use for the unit when none is available */ + result.image = current_val.image.is_void() || current_val.image.get_filename().empty()