[pkgsrc/trunk]: pkgsrc/games/widelands widelands: Update to build 21, based o...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f195a537c1e3
branches:  trunk
changeset: 436118:f195a537c1e3
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jul 27 15:21:42 2020 +0000

description:
widelands: Update to build 21, based on work by Michael Baeuerle in wip

Very long changelog:
https://www.widelands.org/changelog/

diffstat:

 games/widelands/Makefile                                                                |     17 +-
 games/widelands/PLIST                                                                   |  32026 +++------
 games/widelands/distinfo                                                                |     16 +-
 games/widelands/patches/patch-src_CMakeLists.txt                                        |      8 +-
 games/widelands/patches/patch-src_base_i18n.cc                                          |     13 +-
 games/widelands/patches/patch-src_editor_ui__menus_categorized__item__selection__menu.h |     13 -
 games/widelands/patches/patch-src_network_bufferedconnection.h                          |     14 +
 games/widelands/patches/patch-xdg_CMakeLists.txt                                        |     36 +
 8 files changed, 10897 insertions(+), 21246 deletions(-)

diffs (truncated from 33701 to 300 lines):

diff -r 53d42427df2e -r f195a537c1e3 games/widelands/Makefile
--- a/games/widelands/Makefile  Mon Jul 27 15:14:31 2020 +0000
+++ b/games/widelands/Makefile  Mon Jul 27 15:21:42 2020 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2020/06/02 08:23:57 adam Exp $
+# $NetBSD: Makefile,v 1.12 2020/07/27 15:21:42 nia Exp $
 
-DISTNAME=      widelands-build20
-PKGNAME=       widelands-20
-PKGREVISION=   6
+DISTNAME=      widelands-build21-source
+PKGNAME=       widelands-21
 CATEGORIES=    games
 MASTER_SITES=  https://launchpad.net/widelands/build${PKGVERSION_NOREV}/build${PKGVERSION_NOREV}/+download/
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.widelands.org/
@@ -14,8 +12,8 @@
 
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
-USE_TOOLS+=    msgfmt msgmerge xgettext
-USE_LANGUAGES= c c++11
+USE_TOOLS+=    msgfmt msgmerge pkg-config xgettext
+USE_LANGUAGES= c c++
 
 # C++11
 GCC_REQD+=     4.8
@@ -37,6 +35,8 @@
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/doc/widelands
 
+WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
+
 .include "../../mk/bsd.prefs.mk"
 
 # XXX: The following trick might not work everywhere!
@@ -50,6 +50,7 @@
 
 post-install:
        ${MV}   ${DESTDIR}${PREFIX}/widelands \
+               ${DESTDIR}${PREFIX}/wl_create_spritesheet \
                ${DESTDIR}${PREFIX}/wl_map_object_info \
                ${DESTDIR}${PREFIX}/wl_map_info \
                ${DESTDIR}${PREFIX}/bin
@@ -65,10 +66,12 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 53d42427df2e -r f195a537c1e3 games/widelands/PLIST
--- a/games/widelands/PLIST     Mon Jul 27 15:14:31 2020 +0000
+++ b/games/widelands/PLIST     Mon Jul 27 15:21:42 2020 +0000
@@ -1,11 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2019/08/06 19:42:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/07/27 15:21:42 nia Exp $
 bin/widelands
+bin/wl_create_spritesheet
 bin/wl_map_info
 bin/wl_map_object_info
+man/man6/widelands.6
+share/applications/org.widelands.Widelands.desktop
 share/doc/widelands/COPYING
 share/doc/widelands/CREDITS
 share/doc/widelands/ChangeLog
 share/doc/widelands/VERSION
+share/icons/hicolor/128x128/apps/org.widelands.Widelands.png
+share/icons/hicolor/16x16/apps/org.widelands.Widelands.png
+share/icons/hicolor/32x32/apps/org.widelands.Widelands.png
+share/icons/hicolor/48x48/apps/org.widelands.Widelands.png
+share/icons/hicolor/64x64/apps/org.widelands.Widelands.png
+share/metainfo/org.widelands.Widelands.appdata.xml
 share/widelands/ai/ai_input_1.wai
 share/widelands/ai/ai_input_2.wai
 share/widelands/ai/ai_input_3.wai
@@ -62,7 +71,7 @@
 share/widelands/campaigns/bar02.wmf/scripting/mission_thread.lua
 share/widelands/campaigns/bar02.wmf/scripting/starting_conditions.lua
 share/widelands/campaigns/bar02.wmf/scripting/texts.lua
-share/widelands/campaigns/campaigns.conf
+share/widelands/campaigns/campaigns.lua
 share/widelands/campaigns/dummy.wmf/binary/heights
 share/widelands/campaigns/dummy.wmf/binary/mapobjects
 share/widelands/campaigns/dummy.wmf/binary/resource
@@ -229,6 +238,7 @@
 share/widelands/campaigns/tutorial02_warfare.wmf/player_names
 share/widelands/campaigns/tutorial02_warfare.wmf/player_position
 share/widelands/campaigns/tutorial02_warfare.wmf/port_spaces
+share/widelands/campaigns/tutorial02_warfare.wmf/scripting/helper_functions.lua
 share/widelands/campaigns/tutorial02_warfare.wmf/scripting/init.lua
 share/widelands/campaigns/tutorial02_warfare.wmf/scripting/mission_thread.lua
 share/widelands/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua
@@ -242,6 +252,7 @@
 share/widelands/campaigns/tutorial03_seafaring.wmf/player_position
 share/widelands/campaigns/tutorial03_seafaring.wmf/port_spaces
 share/widelands/campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua
+share/widelands/campaigns/tutorial03_seafaring.wmf/scripting/helper_functions_demonstration.lua
 share/widelands/campaigns/tutorial03_seafaring.wmf/scripting/init.lua
 share/widelands/campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua
 share/widelands/campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua
@@ -259,7 +270,7 @@
 share/widelands/campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua
 share/widelands/campaigns/tutorial04_economy.wmf/scripting/starting_conditions.lua
 share/widelands/campaigns/tutorial04_economy.wmf/scripting/texts.lua
-share/widelands/campaigns/tutorials.conf
+share/widelands/campaigns/tutorials.lua
 share/widelands/i18n/fonts.lua
 share/widelands/i18n/fonts/Culmus/LICENSE
 share/widelands/i18n/fonts/Culmus/README
@@ -303,9 +314,6 @@
 share/widelands/i18n/fonts/Nakula/COPYING
 share/widelands/i18n/fonts/Nakula/README.nakula
 share/widelands/i18n/fonts/Nakula/nakula.ttf
-share/widelands/i18n/fonts/Sinhala/COPYING
-share/widelands/i18n/fonts/Sinhala/CREDITS
-share/widelands/i18n/fonts/Sinhala/lklug.ttf
 share/widelands/i18n/fonts/Widelands/FONTLOG
 share/widelands/i18n/fonts/Widelands/LICENSE
 share/widelands/i18n/fonts/Widelands/Widelands.ttf
@@ -316,12 +324,8 @@
 share/widelands/i18n/fonts/amiri/amiri-boldslanted.ttf
 share/widelands/i18n/fonts/amiri/amiri-regular.ttf
 share/widelands/i18n/fonts/amiri/amiri-slanted.ttf
-share/widelands/i18n/fonts/mmrCensus/OFL.txt
-share/widelands/i18n/fonts/mmrCensus/README.mmrCensus
-share/widelands/i18n/fonts/mmrCensus/mmrCensus.ttf
 share/widelands/i18n/locales.lua
 share/widelands/i18n/locales/ar.json
-share/widelands/i18n/locales/ast.json
 share/widelands/i18n/locales/bg.json
 share/widelands/i18n/locales/br.json
 share/widelands/i18n/locales/ca.json
@@ -329,12 +333,10 @@
 share/widelands/i18n/locales/da.json
 share/widelands/i18n/locales/de.json
 share/widelands/i18n/locales/el.json
-share/widelands/i18n/locales/en_CA.json
 share/widelands/i18n/locales/en_GB.json
 share/widelands/i18n/locales/en_US.json
 share/widelands/i18n/locales/eo.json
 share/widelands/i18n/locales/es.json
-share/widelands/i18n/locales/et.json
 share/widelands/i18n/locales/eu.json
 share/widelands/i18n/locales/fa.json
 share/widelands/i18n/locales/fi.json
@@ -347,40 +349,33 @@
 share/widelands/i18n/locales/hi.json
 share/widelands/i18n/locales/hr.json
 share/widelands/i18n/locales/hu.json
-share/widelands/i18n/locales/ia.json
 share/widelands/i18n/locales/id.json
 share/widelands/i18n/locales/ig.json
 share/widelands/i18n/locales/it.json
 share/widelands/i18n/locales/ja.json
-share/widelands/i18n/locales/jv.json
 share/widelands/i18n/locales/ka.json
 share/widelands/i18n/locales/ko.json
 share/widelands/i18n/locales/krl.json
 share/widelands/i18n/locales/la.json
 share/widelands/i18n/locales/locales_translators.json
 share/widelands/i18n/locales/lt.json
-share/widelands/i18n/locales/mr.json
 share/widelands/i18n/locales/ms.json
-share/widelands/i18n/locales/my.json
 share/widelands/i18n/locales/nb.json
 share/widelands/i18n/locales/nds.json
 share/widelands/i18n/locales/nl.json
 share/widelands/i18n/locales/nn.json
-share/widelands/i18n/locales/oc.json
 share/widelands/i18n/locales/pl.json
 share/widelands/i18n/locales/pt.json
 share/widelands/i18n/locales/pt_BR.json
 share/widelands/i18n/locales/ro.json
 share/widelands/i18n/locales/ru.json
-share/widelands/i18n/locales/rw.json
-share/widelands/i18n/locales/si.json
 share/widelands/i18n/locales/sk.json
 share/widelands/i18n/locales/sl.json
 share/widelands/i18n/locales/sr.json
+share/widelands/i18n/locales/sr_RS.json
 share/widelands/i18n/locales/sv.json
 share/widelands/i18n/locales/tr.json
 share/widelands/i18n/locales/uk.json
-share/widelands/i18n/locales/vi.json
 share/widelands/i18n/locales/zh_CN.json
 share/widelands/i18n/locales/zh_TW.json
 share/widelands/i18n/translation_stats.conf
@@ -426,6 +421,7 @@
 share/widelands/images/ui_basic/different.png
 share/widelands/images/ui_basic/fsel.png
 share/widelands/images/ui_basic/fsel_roadbuilding.png
+share/widelands/images/ui_basic/fsel_waterwaybuilding.png
 share/widelands/images/ui_basic/list_first_entry.png
 share/widelands/images/ui_basic/list_selected.png
 share/widelands/images/ui_basic/ls_dir.png
@@ -434,16 +430,19 @@
 share/widelands/images/ui_basic/ls_wlscenario.png
 share/widelands/images/ui_basic/menu_help.png
 share/widelands/images/ui_basic/scrollbar_down.png
+share/widelands/images/ui_basic/scrollbar_down_fast.png
 share/widelands/images/ui_basic/scrollbar_left.png
 share/widelands/images/ui_basic/scrollbar_left_fast.png
 share/widelands/images/ui_basic/scrollbar_right.png
 share/widelands/images/ui_basic/scrollbar_right_fast.png
 share/widelands/images/ui_basic/scrollbar_up.png
+share/widelands/images/ui_basic/scrollbar_up_fast.png
 share/widelands/images/ui_basic/stop.png
 share/widelands/images/ui_fsmenu/challenging.png
 share/widelands/images/ui_fsmenu/easy.png
 share/widelands/images/ui_fsmenu/hard.png
 share/widelands/images/ui_fsmenu/main_title.png
+share/widelands/images/ui_fsmenu/medium.png
 share/widelands/images/ui_fsmenu/menu_load_game.png
 share/widelands/images/ui_fsmenu/random.png
 share/widelands/images/ui_fsmenu/shared_in.png
@@ -474,19 +473,7 @@
 share/widelands/images/wui/buildings/stock_policy_dontstock.png
 share/widelands/images/wui/buildings/stock_policy_prefer.png
 share/widelands/images/wui/buildings/stock_policy_remove.png
-share/widelands/images/wui/editor/editor_menu_player_menu.png
-share/widelands/images/wui/editor/editor_menu_set_toolsize_menu.png
-share/widelands/images/wui/editor/editor_menu_toggle_tool_menu.png
-share/widelands/images/wui/editor/editor_menu_tool_change_height.png
-share/widelands/images/wui/editor/editor_menu_tool_change_resources.png
-share/widelands/images/wui/editor/editor_menu_tool_noise_height.png
-share/widelands/images/wui/editor/editor_menu_tool_place_bob.png
-share/widelands/images/wui/editor/editor_menu_tool_place_immovable.png
-share/widelands/images/wui/editor/editor_menu_tool_set_origin.png
-share/widelands/images/wui/editor/editor_menu_tool_set_port_space.png
-share/widelands/images/wui/editor/editor_menu_tool_set_terrain.png
-share/widelands/images/wui/editor/editor_redo.png
-share/widelands/images/wui/editor/editor_undo.png
+share/widelands/images/wui/buildings/toggle_workarea.png
 share/widelands/images/wui/editor/fsel_editor_decrease_height.png
 share/widelands/images/wui/editor/fsel_editor_decrease_resources.png
 share/widelands/images/wui/editor/fsel_editor_delete.png
@@ -496,24 +483,46 @@
 share/widelands/images/wui/editor/fsel_editor_noise_height.png
 share/widelands/images/wui/editor/fsel_editor_place_critter.png
 share/widelands/images/wui/editor/fsel_editor_place_immovable.png
+share/widelands/images/wui/editor/fsel_editor_resize.png
 share/widelands/images/wui/editor/fsel_editor_set_height.png
 share/widelands/images/wui/editor/fsel_editor_set_port_space.png
 share/widelands/images/wui/editor/fsel_editor_set_resources.png
 share/widelands/images/wui/editor/fsel_editor_unset_port_space.png
+share/widelands/images/wui/editor/menus/load_map.png
+share/widelands/images/wui/editor/menus/main_menu.png
+share/widelands/images/wui/editor/menus/map_options.png
+share/widelands/images/wui/editor/menus/new_map.png
+share/widelands/images/wui/editor/menus/new_random_map.png
+share/widelands/images/wui/editor/menus/redo.png
+share/widelands/images/wui/editor/menus/save_map.png
+share/widelands/images/wui/editor/menus/tools.png
+share/widelands/images/wui/editor/menus/toolsize.png
+share/widelands/images/wui/editor/menus/undo.png
+share/widelands/images/wui/editor/no_ware.png
 share/widelands/images/wui/editor/terrain_arable.png
 share/widelands/images/wui/editor/terrain_mineable.png
 share/widelands/images/wui/editor/terrain_unreachable.png
 share/widelands/images/wui/editor/terrain_unwalkable.png
 share/widelands/images/wui/editor/terrain_walkable.png
 share/widelands/images/wui/editor/terrain_water.png
+share/widelands/images/wui/editor/tools/critters.png
+share/widelands/images/wui/editor/tools/height.png
+share/widelands/images/wui/editor/tools/immovables.png
+share/widelands/images/wui/editor/tools/map_origin.png
+share/widelands/images/wui/editor/tools/noise_height.png
+share/widelands/images/wui/editor/tools/players.png
+share/widelands/images/wui/editor/tools/port_spaces.png
+share/widelands/images/wui/editor/tools/resize_map.png
+share/widelands/images/wui/editor/tools/resources.png
+share/widelands/images/wui/editor/tools/terrain.png
 share/widelands/images/wui/fieldaction/menu_build_flag.png
+share/widelands/images/wui/fieldaction/menu_build_water.png
 share/widelands/images/wui/fieldaction/menu_build_way.png
 share/widelands/images/wui/fieldaction/menu_debug.png
 share/widelands/images/wui/fieldaction/menu_geologist.png
+share/widelands/images/wui/fieldaction/menu_rem_water.png
 share/widelands/images/wui/fieldaction/menu_rem_way.png
 share/widelands/images/wui/fieldaction/menu_rip_flag.png
-share/widelands/images/wui/fieldaction/menu_show_census.png
-share/widelands/images/wui/fieldaction/menu_show_statistics.png
 share/widelands/images/wui/fieldaction/menu_tab_attack.png
 share/widelands/images/wui/fieldaction/menu_tab_buildbig.png
 share/widelands/images/wui/fieldaction/menu_tab_buildmedium.png
@@ -521,30 +530,49 @@
 share/widelands/images/wui/fieldaction/menu_tab_buildport.png
 share/widelands/images/wui/fieldaction/menu_tab_buildroad.png
 share/widelands/images/wui/fieldaction/menu_tab_buildsmall.png
+share/widelands/images/wui/fieldaction/menu_tab_buildwaterway.png
 share/widelands/images/wui/fieldaction/menu_tab_watch.png