gnu: wesnoth: Update to 1.14.6.
* gnu/packages/games.scm (wesnoth): Update to 1.14.6. [source]: Remove upstreamed patch. * packages/patches/wesnoth-newer-boost.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
		
							parent
							
								
									0c2e055e18
								
							
						
					
					
						commit
						17c65da896
					
				
					 3 changed files with 3 additions and 51 deletions
				
			
		|  | @ -1316,7 +1316,6 @@ dist_patch_DATA =						\ | ||||||
|   %D%/packages/patches/wavpack-CVE-2018-7253.patch		\
 |   %D%/packages/patches/wavpack-CVE-2018-7253.patch		\
 | ||||||
|   %D%/packages/patches/wavpack-CVE-2018-7254.patch		\
 |   %D%/packages/patches/wavpack-CVE-2018-7254.patch		\
 | ||||||
|   %D%/packages/patches/weechat-python.patch			\
 |   %D%/packages/patches/weechat-python.patch			\
 | ||||||
|   %D%/packages/patches/wesnoth-newer-boost.patch		\
 |  | ||||||
|   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
 |   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
 | ||||||
|   %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
 |   %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
 | ||||||
|   %D%/packages/patches/wicd-urwid-1.3.patch			\
 |   %D%/packages/patches/wicd-urwid-1.3.patch			\
 | ||||||
|  |  | ||||||
|  | @ -2098,7 +2098,7 @@ falling, themeable graphics and sounds, and replays.") | ||||||
| (define-public wesnoth | (define-public wesnoth | ||||||
|   (package |   (package | ||||||
|     (name "wesnoth") |     (name "wesnoth") | ||||||
|     (version "1.14.5") |     (version "1.14.6") | ||||||
|     (source (origin |     (source (origin | ||||||
|               (method url-fetch) |               (method url-fetch) | ||||||
|               (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" |               (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" | ||||||
|  | @ -2107,8 +2107,7 @@ falling, themeable graphics and sounds, and replays.") | ||||||
|                                   "wesnoth-" version ".tar.bz2")) |                                   "wesnoth-" version ".tar.bz2")) | ||||||
|               (sha256 |               (sha256 | ||||||
|                (base32 |                (base32 | ||||||
|                 "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85")) |                 "0aw3czw3nq8ffakhw2libhvrhnllj61xc5lxpjqv0ig1419s1lj5")))) | ||||||
|               (patches (search-patches "wesnoth-newer-boost.patch")))) |  | ||||||
|     (build-system cmake-build-system) |     (build-system cmake-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:tests? #f))                    ; no check target |      `(#:tests? #f))                    ; no check target | ||||||
|  |  | ||||||
|  | @ -1,46 +0,0 @@ | ||||||
| https://github.com/wesnoth/wesnoth/commit/f6a32792d023d182d350b5a2ed9e469ad67484c8.patch |  | ||||||
| This should be able to be removed with wesnoth@1.14.6 |  | ||||||
| 
 |  | ||||||
| From f6a32792d023d182d350b5a2ed9e469ad67484c8 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Wedge009 <wedge009@wedge009.net> |  | ||||||
| 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 a/src/units/frame.cpp b/src/units/frame.cpp
 |  | ||||||
| index 3215fa4fa79d..6370ad69566b 100644
 |  | ||||||
| --- a/src/units/frame.cpp
 |  | ||||||
| +++ b/src/units/frame.cpp
 |  | ||||||
| @@ -460,15 +460,15 @@ std::vector<std::string> 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<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(static_cast<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(static_cast<bool>(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<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() |  | ||||||
		Reference in a new issue