wesnoth: updated to 1.14.3

Version 1.14.3
 AI
  * Fixed crash in presence of units with negative hitpoints (issue 3042).
  * Efficiency improvements to filter evaluations in the Goto Micro AI and some
    AI helper functions
 Campaigns
  * Dead Water:
    * Fix possibility of villagers blocking pickup of sword in S10 The Flaming
      Sword (issue 3207).
  * Descent Into Darkness:
    * New Parthyn map in S1 and S6.
  * Northern Rebirth:
    * Reduced starting gold and income in scenarios 10 to 13
  * Secrets of the Ancients:
    * Fix S09 Training Session not ending when all dark adepts die (issue 3192)
  * Tutorial:
    * S2: made enemy starting gold equal to that of the player.
  * Under the Burning Suns:
    * Added portrait and updated sprite for Giant Ant.
 Language and i18n
  * Updated translations: British English, Chinese (Traditional), Czech, French,
    Italian, Japanese, Scottish Gaelic, Spanish
 Multiplayer server
  * Fixed lan_server option not causing the server to exit once vacated, e.g.
    when using the Host Networked Game option from the Multiplayer menu in the
    game (issue 3206).
 Music and sound effects
  * The music now changes immediately when you load a save file (issue 2602).
  * Fixed Lua errors when setting a music track that cannot be found when the
    playlist is already empty, e.g. if there's no music installed for the
    game (issue 3194).
 WML engine
  * Removed validation to ensure units cannot have negative hitpoints. We
    learned that the ability to create such units is documented, and thus
    disallowing it was an API change. Since API changes aren't allowed in
    the stable branch, we have reverted it.
 Miscellaneous and bug fixes
  * Fixed an occasional crash at the loading screen related to multi-thread
    access of the image cache.
  * [kill] animate=yes no longer scrolls to units through fog or shroud, thus
    matching 1.12's behavior again.
  * [message] displays the unit type name when a nameless unit speaks and no
    custom caption= is specified (issue 3211).
  * do_not_list=yes units are no longer excluded from the debug mode-only
    Create Unit dialog.
  * Fixed a rare issue where disabled attacks could cause the wrong attack to
    be initially selected in the Unit Attack dialog. This bug also had the
    potential to cause units to the wrong attack when  engaging or viewing
    damage calculations.
  * Fixed [scenario] map_file= being unusable in most circumstances.

Version 1.14.2
 Campaigns
  * Northern Rebirth:
    * S02.1 Infested Caves: keep side 8 AI leader from wandering off too far
      and ending up on a keep with only one hex for recruiting.
    * S02.1 Infested Caves: AIs are less likely to kill each other in early
      game, which would make it harder for the player otherwise.
    * S02.1 Infested Caves: Dwarvish allies are also less likely to die.
    * S02.1 Infested Caves: minor map tweaks and improvements.
    * S05 The Pursuit: removed a bottleneck and tweaked Rod of Justice.
  * Sceptre of Fire:
    * In 'Caverns of Flame', fixed various issues with the volcano eruption.
  * Under the Burning Suns:
    * Various Quenoth unit graphics updates.
  * Descent into Darkness:
    * In 'A small Favor', disabled a not intended way to win the scenario.
  * Secrets of the Ancients:
    * Bats are transformed to normal ones already after S5
 Graphics
  * Fixed a minor team coloring mistake in the north-facing Revenant standing
    animation.
 Language and i18n
  * Updated translations: British English, Chinese (Simplified), Czech, French,
    Galician, German, Italian, Japanese, Scottish Gaelic, Spanish, Ukrainian
 User interface
  * List boxes (MP lobby game list in particular) now keep the scroll position
    when they change, instead of keeping the selected item visible (issue 3016).
  * Fixed MP lobby player list scrolling to top when it changes
  * Fixed the first unit sometimes not being selected when opening the Recall
    dialog.
  * Fixed a crash when using very large portraits in [message] (issue 2912)
  * Added a button to access the version info dialog to Preferences.
  * Removed player list sorting options in the MP lobby. The list is now
    automatically sorted alphabetically, friends first.
  * Rearranged campaign difficulty menu layout
 Terrains
  * Removed hidden terrains that were not supposed to make it to 1.14: ^Prg,
    ^Prgo, ^Pwd, ^Pwdo
 Miscellaneous and bug fixes
  * Fixed memory leak in terrain filter code. In a huge map with Silver Mages,
    it could leak several gigabytes of memory in a long session.
  * Fixed: unit halo remained after undoing a recall (issue 3065)
  * Fixed: unit halo intensity doubled during AMLA animation
  * [change_theme] no longer causes a Lua error when theme= is not specified
    instead of explicitly set to an empty string.
  * [change_theme] no longer requires running a separate action to update the
    UI afterwards (e.g. [redraw]) and the status panels are updated immediately.
    as well.
  * Lua random map generator: fixed error when flipping map; specifically this
    also fixes an assert at the start of HttT S7 (Sceptre of Fire) that had a
    50% chance of being triggered
  * Experimental AI: fixed recruiting not working on maps without enemies, such
    as the first two turns of Dark Forecast
  * Experimental AI: fixed recruiting evaluations sometimes not being updated
  * Replaced deprecated Lua code and all remaining uses of FOREACH and MESSAGE
    macros
  * Fixed [color_adjust] interacting poorly with time of day color shifts and
    values outside the [-255, 255] range (issue 3144).
  * Fixed a regression from 1.13.10 where modification option values couldn't
    be properly saved in arrays.
  * Added stricter validation to ensure units cannot have negative hitpoints,
    except during specific attack-related events.
  * Added deprecation notices for several macros that had them missing before.
  * [message] no longer scrolls to units through fog or shroud so it matches
    1.12's behavior.
  * Fixed animation-wide text_color and blend_color keys being overwritten. This
    fixes level-in and level-out animations sometimes fading to black instead of
    white.
  * Fixed [animate_unit] freezing the game when observing MP games (2970).
  * Fixed carryover behaving differently when loading a start-of-scenario save
    (issue 3152).
  * Fixed turn replay function in MP.
  * Fixed savegames being created even when not needed (issue 3150).
  * Fixed handling of extra_recruit in planning mode (issue 3100).
  * Fixed handling of skirmisher in planning mode.
  * Fixed handling of filter_recall in planning mode.
  * Fixed possible segfault at game end.
  * Fixed require_resource in [resource].
  * Fixed require_scenario=yes not working with map_generation (issue 3105).

Version 1.14.1
 Campaigns
  * Eastern Invasion:
    * In 'Captured', fixed units incorrectly costing upkeep after leveling up.
  * Secrets of the Ancients
    * Fixed minor unit naming inconsistencies (issues 2844 and 2846).
  * Under the Burning Suns
    * Added custom graphics for the broken tree in S1.
    * Various sprite and image updates.
    * Fixed a bug in the formation ability causing defense bonuses not being
      received in some cases.
 Language and i18n
  * Updated translations: British English, Chinese (Simplified), Czech, French,
    Galician, German, Italian, Japanese, Scottish Gaelic, Slovak, Spanish
  * Fixed Logging Options tooltips not being translatable (issue 2837).
  * Add command-line argument to disable the filtering of incomplete translations
    in the language selection list.
 Multiplayer server
  * Added support for matching user, IP, and email bans from a forums board
    when the forum_user_handler is enabled and active. (IP and email bans with
    wildcards are not supported yet.)
  * Fixed various instances of the server crashing under certain conditions.
 Performance
  * Added an option to disable the FPS limiter for a slight performance boost.
 Units
  * Changed the plural name for the merfolk race from Mermen to Merfolk (issue 2940)
    and replaced a few instances in core unit or terrain descriptions accordingly.
 User interface
  * Removed individual Join/Observe buttons for each game in the MP Lobby.
  * Highlight the titles of MP games with vacant slots.
  * Improved MP Lobby layout on low resolutions.
  * Improved reporting of network errors in the MP lobby (issue 3005).
  * Ensure the chat widget remains the correct size even after a window resize.
  * Custom MP game names are now capped at 50 characters.
  * Restored Era info to main MP game display.
  * Improved the resolution selection criteria for the MP Lobby.
  * Fixed inactive weapon specials being displayed in the Unit Attack dialog
    unlike in 1.12 (issue 3033).
 Miscellaneous and bug fixes
  * Removed misleading tooltip text stating registered nicknames are optional for
    the official MP server.
  * Attempting to save a screenshot with an unsupported format now shows an error
    message, instead of saving the screenshot as BMP with the requested extension.
  * It is now possible to disable logdomains in the Logging Options dialog.
  * Fixed the wesnoth(6) manpage claiming the default log level is 'error' when it
    has been 'warning' since version 1.9.0.
  * Document --log-none in the wesnoth(6) manpage.
  * Avoid trying to load invalid base64-encoded data URIs.
  * wesnoth_addon_manager and the addons.wesnoth.org web index can now use data URIs.
  * Fixed a crash when using certain invalid color= values.
  * Implemented a workaround for an unhandled std::bad_cast from string comparison
    functions that caused a crash-to-desktop when opening Preferences among others
    (issue 3050).
  * Fixed many crashes and out-of-sync errors when using the planning mode.

Version 1.14.0
 Campaigns
  * Under the Burning Suns
    * New set of Quenoth faction and character portraits by LordBob.
    * Updated sprites for several Quenoth units.
    * Fixed "Invalid WML found" error that can be caused by the Quenoth Youth
      support ability.
 Help browser
  * Temporarily hidden Editor section as it is mostly incomplete and of little
    use right now (issue 2963).
 Language and i18n
  * Fixed Version label on the title screen not being translatable (issue 2914).
  * Updated translations: Czech, French, Galician, German, Japanese, Polish,
    Scottish Gaelic, Slovak, Spanish
 Multiplayer
  * Fixed regression causing a crash-to-desktop when trying to log into the
    server using a registered and active account without specifying a
    password.
  * Fixed an infinite loading screen if the server shut down or restarted
    mid-login.
  * Fixed an infinite loading screen when attempting to login with an
    unregistered nickname followed by a registered one.
  * Dark Forecast: Fixed possible Lua error when the weather changes.
 User Interface
  * Implemented MP chat message history saving (issue 1194, issue 2802).
  * Fixed context menus not dismissing on right click.
 Miscellaneous and bug fixes
  * Fixed an AI assertion when a unit with one disabled attack attacked a unit
    with no attacks or a single disabled attack.

10 files changed, 59 insertions, 116 deletions

diff --git a/games/wesnoth/patches/patch-CMakeLists.txt b/games/wesnoth/patches/patch-CMakeLists.txt
index cdbda786c88..89c4cfd169a 100644
--- a/games/wesnoth/patches/patch-CMakeLists.txt
+++ b/games/wesnoth/patches/patch-CMakeLists.txt
@@ -1,35 +1,40 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/07/18 06:37:41 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/24 16:02:50 adam Exp $
 
-Don't look for X11 on Mac OS X
-Fix MANDIR
+Do not look for X11 on macOS.
+Remove -O3.
+Do not bother with uninstaller.
 
---- CMakeLists.txt.orig	2012-05-01 21:08:26.000000000 +0000
+--- CMakeLists.txt.orig	2018-06-10 00:02:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -27,7 +27,9 @@ find_package(Gettext)
- # src/gettext.cpp since it includes libintl.h)
- find_package(Libintl REQUIRED)
+@@ -68,7 +68,9 @@ find_package(Boost 1.50 REQUIRED COMPONE
+ # no, gettext executables are not required when NLS is deactivated
+ find_package(Gettext)
  
 +if(NOT APPLE)
  find_package(X11)
 +endif(NOT APPLE)
  
- if(NOT MSVC)
- 	#needed to get some SDL defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
-@@ -55,7 +57,7 @@ include(SearchForStuff)
- set(BINDIR "bin" CACHE STRING "Where to install binaries")
- set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
- set(DOCDIR "${DATAROOTDIR}/doc/wesnoth" CACHE STRING "Sets the doc directory to a non-default location.")
--set(MANDIR "${DATAROOTDIR}/man" CACHE STRING "Where to install manpages")
-+set(MANDIR "man" CACHE STRING "Where to install manpages")
- set(DATADIRNAME "wesnoth" CACHE STRING "change the name of the directory for the read-only architecture-independent game data")
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}" CACHE STRING "change the dir where binaries are placed right at compile time")
- set(LOCALEDIR "translations" CACHE STRING "change the name of the locale data directory to a non-default name")
-@@ -307,11 +309,6 @@ install(FILES l10n-track DESTINATION ${D
+ # needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
+ set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
+@@ -258,9 +260,9 @@ RemoveFlag(CMAKE_SHARED_LIBRARY_LINK_C_F
+ # #
+ 
+ # reset the base Release build option
+-MESSAGE("Replacing default flags used for Release build with -O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+-set(CMAKE_C_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
++MESSAGE("Replacing default flags used for Release build with ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
++set(CMAKE_CXX_FLAGS_RELEASE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
++set(CMAKE_C_FLAGS_RELEASE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
+ # set the arch to use for Release build if provided
+ if(ARCH)
+@@ -557,11 +559,6 @@ endif(ENABLE_GAME)
  # uninstall
  #
  
 -configure_file(
--	"${CMAKE_MODULE_PATH}/uninstall.cmake.in"
+-	"${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in"
 -	"${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
 -	IMMEDIATE @ONLY
 -)
diff --git a/games/wesnoth/patches/patch-ae b/games/wesnoth/patches/patch-ae
deleted file mode 100644
index 255688f42d5..00000000000
--- a/games/wesnoth/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2015/03/10 05:16:28 mef Exp $
-
-Make it build on FreeBSD and DragonFly
-
---- src/network_worker.cpp.orig	2010-01-01 13:16:49.000000000 +0000
-+++ src/network_worker.cpp
-@@ -37,6 +37,10 @@
- #include <deque>
- #include <sstream>
- 
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#undef HAVE_SENDFILE
-+#endif
-+
- #ifdef HAVE_SENDFILE
- #include <sys/sendfile.h>
- #include <netinet/in.h>
diff --git a/games/wesnoth/patches/patch-af b/games/wesnoth/patches/patch-af
deleted file mode 100644
index 1d1d3413a57..00000000000
--- a/games/wesnoth/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.7 2015/03/10 05:16:28 mef Exp $
-
---- src/preferences.cpp.orig	2015-01-24 06:21:14.000000000 +0900
-+++ src/preferences.cpp	2015-03-10 00:48:59.000000000 +0900
-@@ -32,6 +32,7 @@
- #include "util.hpp"
- 
- #include <sys/stat.h> // for setting the permissions of the preferences file
-+#include <unistd.h>
- #include <boost/concept_check.hpp>
- 
- static lg::log_domain log_config("config");
diff --git a/games/wesnoth/patches/patch-ah b/games/wesnoth/patches/patch-ah
deleted file mode 100644
index 4b5d88a5222..00000000000
--- a/games/wesnoth/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2012/07/18 06:37:42 adam Exp $
-
-Fix C++ error.
-
---- src/controller_base.cpp.orig	2011-02-24 12:28:03.000000000 +0000
-+++ src/controller_base.cpp
-@@ -50,6 +50,7 @@ void controller_base::handle_event(const
- 	if(gui::in_dialog()) {
- 		return;
- 	}
-+	SDL_Event new_event;
- 
- 	switch(event.type) {
- 	case SDL_KEYDOWN:
-@@ -76,7 +77,6 @@ void controller_base::handle_event(const
- 		break;
- 	case SDL_MOUSEMOTION:
- 		// Ignore old mouse motion events in the event queue
--		SDL_Event new_event;
- 		if(SDL_PeepEvents(&new_event,1,SDL_GETEVENT,
- 					SDL_EVENTMASK(SDL_MOUSEMOTION)) > 0) {
- 			while(SDL_PeepEvents(&new_event,1,SDL_GETEVENT,
diff --git a/games/wesnoth/patches/patch-data_tools_addon__manager_html_py b/games/wesnoth/patches/patch-data_tools_addon__manager_html_py
deleted file mode 100644
index 47217a49cb0..00000000000
--- a/games/wesnoth/patches/patch-data_tools_addon__manager_html_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-data_tools_addon__manager_html_py,v 1.1 2015/03/10 05:16:28 mef Exp $
-
-Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
-
---- data/tools/addon_manager/html.py~	2015-01-24 06:21:14.000000000 +0900
-+++ data/tools/addon_manager/html.py	2015-03-10 11:09:19.000000000 +0900
-@@ -1,3 +1,4 @@
-+#!@python@
- # encoding: utf8
- import time, os, glob, sys, re
- from subprocess import Popen
diff --git a/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh b/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh
deleted file mode 100644
index 966985fe853..00000000000
--- a/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-data_tools_castle-clutter_mk_all-castles_sh,v 1.1 2015/03/10 05:16:28 mef Exp $
-
-Add missing ! on shebang line (to be processed by REPLACE_BASH)
-
---- data/tools/castle-cutter/mk-all-castles.sh~	2015-01-24 06:21:14.000000000 +0900
-+++ data/tools/castle-cutter/mk-all-castles.sh	2015-03-10 12:39:34.000000000 +0900
-@@ -1,4 +1,4 @@
--#/bin/bash
-+#!/bin/bash
- 
- ./mk-castle.sh -b castle -c cutout.png -o castle -t castle-walls.tmpl castle.png
- 
diff --git a/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py b/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py
deleted file mode 100644
index d544cad3df9..00000000000
--- a/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-data_tools_unit__tree_helpers_py,v 1.1 2015/03/10 05:16:28 mef Exp $
-
-Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
-
---- data/tools/unit_tree/helpers.py~	2015-01-24 06:21:14.000000000 +0900
-+++ data/tools/unit_tree/helpers.py	2015-03-10 12:15:24.000000000 +0900
-@@ -1,3 +1,4 @@
-+#!@python
- """
- Various helpers for use by the wmlunits tool.
- """
diff --git a/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py b/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py
deleted file mode 100644
index 20e665b760c..00000000000
--- a/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-data_tools_wesnoth_campaignserver__client_py,v 1.1 2015/03/10 05:16:28 mef Exp $
-
-Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
-
---- data/tools/wesnoth/campaignserver_client.py~	2015-03-10 10:48:54.000000000 +0900
-+++ data/tools/wesnoth/campaignserver_client.py	2015-03-10 11:15:44.000000000 +0900
-@@ -1,3 +1,4 @@
-+#!@/python@
- import gzip, zlib, StringIO
- import socket, struct, glob, sys, shutil, threading, os, fnmatch
- import wesnoth.wmldata as wmldata
diff --git a/games/wesnoth/patches/patch-src_CMakeLists.txt b/games/wesnoth/patches/patch-src_CMakeLists.txt
new file mode 100644
index 00000000000..8ace57eed4a
--- /dev/null
+++ b/games/wesnoth/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2018/06/24 16:02:50 adam Exp $
+
+On macOS, do not build SDLMain.mm; only needed for app bundle.
+
+--- src/CMakeLists.txt.orig	2018-06-10 00:02:23.000000000 +0000
++++ src/CMakeLists.txt
+@@ -285,11 +285,7 @@ add_library(wesnoth-game ${LIBRARY_TYPE}
+ ########### Wesnoth ###############
+ 
+ if(ENABLE_GAME)
+-	if(NOT APPLE)
+-		add_executable(wesnoth WIN32 wesnoth.cpp)
+-	else()
+-		add_executable(wesnoth WIN32 wesnoth.cpp macosx/SDLMain.mm)
+-	endif(NOT APPLE)
++	add_executable(wesnoth WIN32 wesnoth.cpp)
+ 
+ 	target_link_libraries(wesnoth
+ 		wesnoth-client
diff --git a/games/wesnoth/patches/patch-src_wesnoth.cpp b/games/wesnoth/patches/patch-src_wesnoth.cpp
new file mode 100644
index 00000000000..81c30415f3c
--- /dev/null
+++ b/games/wesnoth/patches/patch-src_wesnoth.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_wesnoth.cpp,v 1.1 2018/06/24 16:02:50 adam Exp $
+
+On macOS, use regular (); wesnoth_main() only needed for app bundle.
+
+--- src/wesnoth.cpp.orig	2018-06-24 12:26:22.000000000 +0000
++++ src/wesnoth.cpp
+@@ -1012,7 +1012,7 @@ static void restart_process()
+ #define error_exit(res) return res
+ #endif
+ 
+-#ifdef __APPLE__
++#if 0
+ extern "C" int wesnoth_main(int argc, char** argv);
+ int wesnoth_main(int argc, char** argv)
+ #else