1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Update to 1.14.6

- Take maintainership
This commit is contained in:
Wen Heping 2019-03-19 02:03:31 +00:00
parent 1cd9894eca
commit 20925b0644
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=496236
4 changed files with 7 additions and 43 deletions

View File

@ -1,15 +1,14 @@
# $FreeBSD$
PORTNAME= wesnoth
PORTVERSION= 1.14.5
PORTREVISION= 2
PORTVERSION= 1.14.6
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
http://files.wesnoth.org/ \
http://ports.toco-domains.de/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= wen@FreeBSD.org
COMMENT= Fantasy turn-based strategy game
LICENSE= GPLv2 GPLv3

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1537956839
SHA256 (wesnoth-1.14.5.tar.bz2) = 05317594b1072b6cf9f955e3a7951a28096f8b1e3afed07825dd5a219c90f7cd
SIZE (wesnoth-1.14.5.tar.bz2) = 450766063
TIMESTAMP = 1552030971
SHA256 (wesnoth-1.14.6.tar.bz2) = 45d2a05320e145b0b1bc9d16d68391945a98375c910a0ea7720e613bf867832b
SIZE (wesnoth-1.14.6.tar.bz2) = 451793873

View File

@ -1,32 +0,0 @@
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<std::string> 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()

View File

@ -1695,21 +1695,18 @@ share/icons/hicolor/64x64/apps/wesnoth-icon.png
%%NLS%%%%SERVER%%man/de/man6/wesnothd.6.gz
%%NLS%%man/en_GB/man6/wesnoth.6.gz
%%NLS%%%%SERVER%%man/en_GB/man6/wesnothd.6.gz
%%NLS%%man/es/man6/wesnoth.6.gz
%%NLS%%%%SERVER%%man/es/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/et/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/fi/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/fr/man6/wesnothd.6.gz
%%NLS%%man/fr/man6/wesnoth.6.gz
%%NLS%%man/gl/man6/wesnoth.6.gz
%%NLS%%%%SERVER%%man/gl/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/hu/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/id/man6/wesnothd.6.gz
%%NLS%%man/it/man6/wesnoth.6.gz
%%NLS%%%%SERVER%%man/it/man6/wesnothd.6.gz
%%NLS%%man/ja/man6/wesnoth.6.gz
%%NLS%%%%SERVER%%man/ja/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/lt/man6/wesnothd.6.gz
%%NLS%%man/lt/man6/wesnoth.6.gz
%%NLS%%man/lt/man6/wesnothd.6.gz
man/man6/wesnoth.6.gz
%%SERVER%%man/man6/wesnothd.6.gz
%%NLS%%%%SERVER%%man/pl/man6/wesnothd.6.gz