Hello community, here is the log from the commit of package wesnoth for openSUSE:Factory checked in at 2018-12-07 14:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wesnoth (Old) and /work/SRC/openSUSE:Factory/.wesnoth.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wesnoth" Fri Dec 7 14:36:41 2018 rev:9 rq:655724 version:1.14.5 Changes: -------- --- /work/SRC/openSUSE:Factory/wesnoth/wesnoth.changes 2018-09-25 15:45:51.581070287 +0200 +++ /work/SRC/openSUSE:Factory/.wesnoth.new.19453/wesnoth.changes 2018-12-07 14:36:45.982969575 +0100 @@ -1,0 +2,6 @@ +Fri Nov 30 14:00:13 UTC 2018 - adam.ma...@suse.de + +- fix_boost_1_59.patch: explicit cast required to build with + Boost 1.69 and logic::tribool + +------------------------------------------------------------------- New: ---- fix_boost_1_59.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wesnoth.spec ++++++ --- /var/tmp/diff_new_pack.Zxv0bx/_old 2018-12-07 14:36:53.078960782 +0100 +++ /var/tmp/diff_new_pack.Zxv0bx/_new 2018-12-07 14:36:53.082960777 +0100 @@ -26,6 +26,7 @@ Group: Amusements/Games/Strategy/Turn Based Url: http://www.wesnoth.org Source: http://downloads.sf.net/project/wesnoth/wesnoth-%{major_version}/wesnoth-%{version}/wesnoth-%{version}.tar.bz2 +Patch1: fix_boost_1_59.patch BuildRequires: cmake >= 2.8.5 BuildRequires: dejavu BuildRequires: fdupes @@ -105,6 +106,7 @@ %prep %setup -q +%patch1 -p1 # Fix rpmlint's "E: env-script-interpreter". sed -i "s:/usr/bin/env python:/usr/bin/python:g" $(find data/tools -type f) ++++++ fix_boost_1_59.patch ++++++ Index: wesnoth-1.14.5/src/units/frame.cpp =================================================================== --- wesnoth-1.14.5.orig/src/units/frame.cpp +++ wesnoth-1.14.5/src/units/frame.cpp @@ -460,15 +460,15 @@ std::vector<std::string> frame_parsed_pa } 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 } // Convert the tribool to bool - const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); + const bool primary = (bool)result.primary_frame || 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()
