wesnoth: updated to 1.14.4

Version 1.14.4
 * Security Fixes
   * Fixed Lua being able to escape sandboxing via load/loadstring (CVE-2018-1999023).
 * Add-ons server
   * Made it so plain-text .po catalogues in add-ons are detected and added to
     the list of translations for them.
 * Campaigns
   * Dead Water:
     * In 'Tirigaz', take the situation into account of orcs being killed either
       first or by undead.
   * Delfador's Memoirs:
     * Fix hero units costing upkeep
   * Eastern Invasion:
     * Fixed missing prisoners and loss of recallable units in 'Captured'.
   * Northern Rebirth:
     * Level 0 units are not available anymore after scenario 5
   * Secrets of the Ancients:
     * Adjust gender of enemies to better match story in S11 & 21
     * Simplify dialog to fix possible confusion in S16
     * Have nagas be able to recruit in S21
   * The South Guard:
     * S4: undead leader won't leave the castle anymore
     * S5: the untypical situation that one can defeat the lich before finding
       Urza Afalas is now handled
   * Under the Burning Suns:
     * S11: added custom graphics for the citadel.
     * S12: clarified the alien bodies' weaknesses.
     * Various visual improvements.
 * Editor
   * Fixed saving a map as a scenario not enabling scenario editor tools.
 * Graphics
   * New attack animation for the Peasant.
   * Tweaked the Ruffian's attack animation timing.
 * Language and i18n
   * Updated translations: British English, Bulgarian, Chinese (Simplified),
     Chinese (Traditional), Czech, French, German, Hungarian, Japanese,
     Scottish Gaelic, Slovak, Spanish
 * Lua API
   * Upgrade to Lua 5.3.5.
 * Multiplayer server
   * Fixed lobby and whisper messages not having a maximum length.
 * User interface
   * Improved the layout of the Statistics dialog.
   * Allow changing dropdown menu selections with the scrollwheel.
   * Fixed lobby chat box scrolling to top on a new message if it isn't at the
     bottom
   * Fixed the unit preview pane not showing the default race icon when detailing
     a single unit's stats.
   * Sort units secondarily by XP in the unit list dialog.
   * Whiteboard related bugfixes
 * WML engine
   * Fixed errors about WESNOTH_VERSION not being defined when trying to load
     add-ons that have preprocessor errors.
 * Miscellaneous and bug fixes
   * Added an advanced preference to enable experimental PRNG combat.
   * Campfires use illumination instead of a different ToD.
   * Linux builds now enable security hardening by default.
   * Fixed MP admins being unable to observe private games.
   * Fixed MP faction, leader, and leader gender changes persisting even if the
     selection dialog is dismissed.
   * Fixed an issue with positioned sound sources ignoring the volume set in
     Preferences after going off the audible radius and back.
   * Fixed wmllint choking on gzipped binary files (e.g. gzipped tarballs).
   * Fixed wmllint crashing on nonexistent paths provided in the command line.
   * Slight changes to the objectives dialogue
   * Greatly improved touch control support.
   * Fixed wmlindent crashing on nonexistent paths provided in the command line

4 files changed, 28 insertions, 26 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 83e9dae691f..8adbc5095dc 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.134 2018/06/24 16:02:50 adam Exp $
+# $NetBSD: Makefile,v 1.135 2018/07/26 10:19:56 adam Exp $
 
-DISTNAME=	wesnoth-1.14.3
+DISTNAME=	wesnoth-1.14.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,6 +18,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		bash msgfmt perl:run pkg-config
 # detects history.h, but does not link against libhistory
 CMAKE_ARGS+=		-DENABLE_HISTORY=OFF
+# if OPT is set, -O3 will not be added
+CMAKE_ARGS+=		-DOPT="${DBG}"
 
 UNLIMIT_RESOURCES+=	datasize
 UNLIMIT_RESOURCES+=	stacksize
@@ -34,6 +36,7 @@ REPLACE_PYTHON+=	data/tools/extractbindings
 REPLACE_PYTHON+=	data/tools/imgcheck
 REPLACE_PYTHON+=	data/tools/journeylifter
 REPLACE_PYTHON+=	data/tools/rmtrans/rmtrans.py
+REPLACE_PYTHON+=	data/tools/steam-changelog
 REPLACE_PYTHON+=	data/tools/trackplacer
 REPLACE_PYTHON+=	data/tools/unit_tree/helpers.py
 REPLACE_PYTHON+=	data/tools/unit_tree/TeamColorizer
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 846e9c057c7..9aea970246c 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2018/06/24 16:02:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.46 2018/07/26 10:19:56 adam Exp $
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnothd.6
@@ -2178,6 +2178,7 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/leader.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/sand-storm.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/attacks/twister.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/campaign_image.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/burial2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/kaleh-dead.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-n.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-ne.png
@@ -2186,7 +2187,9 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-s.p
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-se.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/magiccircle-sw.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/orcish-flag2.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/orcish-flag3.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/parchment.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rock-cairn3.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune-lightblue-small.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune-violet2.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/items/rune2-burning.png
@@ -2239,6 +2242,9 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-stor
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-6.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-7.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/projectiles/sand-storm-8.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol_clouds.png
+share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/citadel_zocthanol_sub.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/dark-keep-throne.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/darkcastle.png
 share/wesnoth/data/campaigns/Under_the_Burning_Suns/images/terrain/great-tree-smashed.png
@@ -11331,7 +11337,11 @@ share/wesnoth/data/core/images/units/human-outlaws/trapper-die-7.png
 share/wesnoth/data/core/images/units/human-outlaws/trapper-die-8.png
 share/wesnoth/data/core/images/units/human-outlaws/trapper.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-attack.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-attack1.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-attack2.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-attack3.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-attack4.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-attack5.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-defend.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-idle-1.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-idle-2.png
@@ -11341,6 +11351,8 @@ share/wesnoth/data/core/images/units/human-peasants/peasant-idle-5.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-idle-6.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-idle-7.png
 share/wesnoth/data/core/images/units/human-peasants/peasant-ranged.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-ranged1.png
+share/wesnoth/data/core/images/units/human-peasants/peasant-ranged2.png
 share/wesnoth/data/core/images/units/human-peasants/peasant.png
 share/wesnoth/data/core/images/units/human-peasants/ruffian-attack-1.png
 share/wesnoth/data/core/images/units/human-peasants/ruffian-attack-2.png
@@ -14446,6 +14458,7 @@ share/wesnoth/data/tools/journeylifter
 share/wesnoth/data/tools/rmtrans/README.md
 share/wesnoth/data/tools/rmtrans/rmtrans.py
 share/wesnoth/data/tools/scoutDefault.py
+share/wesnoth/data/tools/steam-changelog
 share/wesnoth/data/tools/terrain2wiki.py
 share/wesnoth/data/tools/trackplacer
 share/wesnoth/data/tools/unit_tree/TeamColorizer
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 22bf9e6d95d..3ea97ddcb44 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.59 2018/06/24 16:02:50 adam Exp $
+$NetBSD: distinfo,v 1.60 2018/07/26 10:19:56 adam Exp $
 
-SHA1 (wesnoth-1.14.3.tar.bz2) = 41e1c9aef297f76b443c9566bdbb2a352dead83f
-RMD160 (wesnoth-1.14.3.tar.bz2) = fd3db82d975ec18a91d1c791d8289af9c356ca14
-SHA512 (wesnoth-1.14.3.tar.bz2) = da9343e7a83f183bba5f8cad6397745370b64de2e8e319eae256097d27bba536b871d1899f472685e74584bc601f59d16da8c14359c74eea0a6fb074c078bb9d
-Size (wesnoth-1.14.3.tar.bz2) = 450194119 bytes
-SHA1 (patch-CMakeLists.txt) = 116bb4eb53408f04223c26c81efead19edb58fe6
+SHA1 (wesnoth-1.14.4.tar.bz2) = a4e1c17f90d5b50405e7e2fa06445e840bd49913
+RMD160 (wesnoth-1.14.4.tar.bz2) = a69e636500f47a5563ed1ad87dc9ae8dd999091b
+SHA512 (wesnoth-1.14.4.tar.bz2) = 644bfe09f9801c7a547f61ce61118349b2b3c6dcb9e000a926e31cd95ccf522bb507771781e9c52ed5b504fad024406b9685912cad1ac5ff01d5420090d26068
+Size (wesnoth-1.14.4.tar.bz2) = 450573177 bytes
+SHA1 (patch-CMakeLists.txt) = 5c580a7b9719d769507c2c0ec3580d6cf523e7f0
 SHA1 (patch-src_CMakeLists.txt) = 5839663ab11a9fdc31e89b74ce2708a251155d9f
 SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67
diff --git a/games/wesnoth/patches/patch-CMakeLists.txt b/games/wesnoth/patches/patch-CMakeLists.txt
index 89c4cfd169a..64c6d76fc24 100644
--- a/games/wesnoth/patches/patch-CMakeLists.txt
+++ b/games/wesnoth/patches/patch-CMakeLists.txt
@@ -1,10 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/24 16:02:50 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2018/07/26 10:19:56 adam Exp $
 
 Do not look for X11 on macOS.
-Remove -O3.
 Do not bother with uninstaller.
 
---- CMakeLists.txt.orig	2018-06-10 00:02:23.000000000 +0000
+--- CMakeLists.txt.orig	2018-07-22 11:40:33.000000000 +0000
 +++ CMakeLists.txt
 @@ -68,7 +68,9 @@ find_package(Boost 1.50 REQUIRED COMPONE
  # no, gettext executables are not required when NLS is deactivated
@@ -16,20 +15,7 @@ Do not bother with uninstaller.
  
  # 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)
+@@ -601,11 +576,6 @@ endif(ENABLE_GAME)
  # uninstall
  #