diff --git a/srcpkgs/wesnoth/patches/boost-1.69.patch b/srcpkgs/wesnoth/patches/boost-1.69.patch deleted file mode 100644 index ac9e69f761..0000000000 --- a/srcpkgs/wesnoth/patches/boost-1.69.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f6a32792d023d182d350b5a2ed9e469ad67484c8 Mon Sep 17 00:00:00 2001 -From: Wedge009 -Date: Thu, 27 Dec 2018 08:15:10 +1100 -Subject: [PATCH] Use explicit casts to accommodate changes to boost's tribool - in 1.69. - -(fixes #3646) ---- - src/units/frame.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git src/units/frame.cpp src/units/frame.cpp -index 3215fa4fa79d..6370ad69566b 100644 ---- src/units/frame.cpp -+++ src/units/frame.cpp -@@ -460,15 +460,15 @@ std::vector frame_parsed_parameters::debug_strings() const - } - - if(!boost::indeterminate(auto_vflip_)) { -- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); -+ v.emplace_back("auto_vflip=" + utils::bool_string(static_cast(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(static_cast(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(static_cast(primary_frame_))); - } - - if(!drawing_layer_.get_original().empty()) { -@@ -768,7 +768,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time, const fram - } - - // Convert the tribool to bool -- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); -+ const bool primary = static_cast(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() diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index ec79af86e0..ecd5b2ad19 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth -version=1.14.5 -revision=4 +version=1.14.6 +revision=1 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config" @@ -12,9 +12,9 @@ depends="wesnoth-data desktop-file-utils" short_desc="Turn-based fantasy strategy game" maintainer="Philipp Hirsch " license="GPL-2.0-or-later" -homepage="https://wesnoth.org/" +homepage="https://wesnoth.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=05317594b1072b6cf9f955e3a7951a28096f8b1e3afed07825dd5a219c90f7cd +checksum=45d2a05320e145b0b1bc9d16d68391945a98375c910a0ea7720e613bf867832b post_install() { # runit service @@ -22,7 +22,7 @@ post_install() { } wesnoth-data_package() { - noarch=yes + archs=noarch pkg_install() { vmove usr/share/wesnoth }