10/14: gnu: wesnoth: Update to 1.14.6.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 17c65da8967719429f55e91119be92984cc9b477
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Wed Feb 27 10:50:10 2019 +0100

    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.
---
 gnu/local.mk                                   |  1 -
 gnu/packages/games.scm                         |  7 ++--
 gnu/packages/patches/wesnoth-newer-boost.patch | 46 --------------------------
 3 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 602e9fe..0ddf12d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1316,7 +1316,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/wavpack-CVE-2018-7253.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7254.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-get-selected-profile-fix.patch     \
   %D%/packages/patches/wicd-urwid-1.3.patch                    \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 24c9301..53c4763 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2098,7 +2098,7 @@ falling, themeable graphics and sounds, and replays.")
 (define-public wesnoth
   (package
     (name "wesnoth")
-    (version "1.14.5")
+    (version "1.14.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@@ -2107,11 +2107,10 @@ falling, themeable graphics and sounds, and replays.")
                                   "wesnoth-" version ".tar.bz2"))
               (sha256
                (base32
-                "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85"))
-              (patches (search-patches "wesnoth-newer-boost.patch"))))
+                "0aw3czw3nq8ffakhw2libhvrhnllj61xc5lxpjqv0ig1419s1lj5"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f)) ; no check target
+     `(#:tests? #f))                    ; no check target
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/patches/wesnoth-newer-boost.patch 
b/gnu/packages/patches/wesnoth-newer-boost.patch
deleted file mode 100644
index d48a48e..0000000
--- a/gnu/packages/patches/wesnoth-newer-boost.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/wesnoth/wesnoth/commit/f6a32792d023d182d350b5a2ed9e469ad67484c8.patch
-This should be able to be removed with address@hidden
-
-From f6a32792d023d182d350b5a2ed9e469ad67484c8 Mon Sep 17 00:00:00 2001
-From: Wedge009 <address@hidden>
-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()