diff -Nru wesnoth-1.13-1.13.1/debian/changelog wesnoth-1.13-1.13.1/debian/changelog --- wesnoth-1.13-1.13.1/debian/changelog 2015-06-29 07:16:07.000000000 +0000 +++ wesnoth-1.13-1.13.1/debian/changelog 2019-08-20 07:10:18.000000000 +0000 @@ -1,3 +1,9 @@ +wesnoth-1.13 (1:1.13.1-1+rpi1) bullseye-staging; urgency=medium + + * Apply patches to fix build with newer boost. + + -- Peter Michael Green Tue, 20 Aug 2019 07:10:18 +0000 + wesnoth-1.13 (1:1.13.1-1) unstable; urgency=medium * New upstream devel release. diff -Nru wesnoth-1.13-1.13.1/debian/patches/04boost.patch wesnoth-1.13-1.13.1/debian/patches/04boost.patch --- wesnoth-1.13-1.13.1/debian/patches/04boost.patch 1970-01-01 00:00:00.000000000 +0000 +++ wesnoth-1.13-1.13.1/debian/patches/04boost.patch 2019-08-20 07:10:18.000000000 +0000 @@ -0,0 +1,39 @@ +Patch to make wesnoth-1.13 build with buster's boost by Peter Michael Green +, partially based on the git commit described below. + +From aa1ea043bbf52d509197eab91ab85c70e633d69e Mon Sep 17 00:00:00 2001 +From: Celtic Minstrel +Date: Fri, 25 Dec 2015 08:17:33 -0500 +Subject: [PATCH] Use boost::none instead of boost::none_t() + +Fixes bug 24227 +--- + src/play_controller.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: wesnoth-1.13-1.13.1/src/play_controller.hpp +=================================================================== +--- wesnoth-1.13-1.13.1.orig/src/play_controller.hpp ++++ wesnoth-1.13-1.13.1/src/play_controller.hpp +@@ -125,7 +125,7 @@ public: + end_level_data_ = data; + } + void reset_end_level_data() { +- end_level_data_ = boost::none_t(); ++ end_level_data_ = boost::none; + } + bool is_regular_game_end() const { + return end_level_data_.get_ptr() != NULL; +Index: wesnoth-1.13-1.13.1/src/game_config_manager.cpp +=================================================================== +--- wesnoth-1.13-1.13.1.orig/src/game_config_manager.cpp ++++ wesnoth-1.13-1.13.1/src/game_config_manager.cpp +@@ -81,7 +81,7 @@ bool game_config_manager::init_game_conf + // Add preproc defines according to the command line arguments. + game_config::scoped_preproc_define multiplayer("MULTIPLAYER", + cmdline_opts_.multiplayer); +- game_config::scoped_preproc_define test("TEST", cmdline_opts_.test); ++ game_config::scoped_preproc_define test("TEST", bool(cmdline_opts_.test)); + game_config::scoped_preproc_define mptest("MP_TEST", cmdline_opts_.mptest); + game_config::scoped_preproc_define editor("EDITOR", jump_to_editor_); + game_config::scoped_preproc_define title_screen("TITLE_SCREEN", diff -Nru wesnoth-1.13-1.13.1/debian/patches/series wesnoth-1.13-1.13.1/debian/patches/series --- wesnoth-1.13-1.13.1/debian/patches/series 2015-05-01 09:54:49.000000000 +0000 +++ wesnoth-1.13-1.13.1/debian/patches/series 2019-08-20 07:10:18.000000000 +0000 @@ -1,2 +1,3 @@ 02wesnoth-nolog-desktop-file 03wesnothd-name +04boost.patch