Wed Jan 8 16:59:07 2020 UTC ()
7kaa: Update to 2.15.3

This release fixes bugs, improves synchronization in multiplayer, has UI fixes, and adds several advanced config options.

Summary of changes from 2.15.2 to 2.15.3

- Fixed corrupt characters and fields in various in game messages.
- Improved translation support.
- Updated translations.
- Added some UI improvements.
- Fixed some crashing issues related to spies.
- Standardized on FPU code generation for better cross-platform compatibility.
- Added more advanced config options.
- Added more advanced config options.
- Improved manual.
- Added key binding support.
- Prevented chat keystrokes registering as a hotkey too.
- Fixed sometimes hiring wrong unit in the inn.
- Added scenario advanced config presets to restore default scenario game play to original game design parameters.
- Ensure screen redraw when dropping spy identity.
- Improved alternate font set.
- Added scroll button for long tutor messages.
- Removed gong sound for unsent AI diplomatic messages.
- Re-enabled AI ability to request direct military aid; expect allied AI to work together on defending now.
- Removed uninitialized parameter in Caravan CRC check.
- Removed improper variable-size cast, causing incorrect action processing on 64-bit platforms.
- Correct replay initialization for weather sync.


(nia)
diff -r1.6 -r1.7 pkgsrc/games/7kaa/Makefile
diff -r1.2 -r1.3 pkgsrc/games/7kaa/PLIST
diff -r1.3 -r1.4 pkgsrc/games/7kaa/distinfo
diff -r1.3 -r1.4 pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp
cvs diff -r1.6 -r1.7 pkgsrc/games/7kaa/Makefile (expand / switch to unified diff)

--- pkgsrc/games/7kaa/Makefile 2019/11/30 11:47:15 1.6
+++ pkgsrc/games/7kaa/Makefile 2020/01/08 16:59:07 1.7
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.6 2019/11/30 11:47:15 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2020/01/08 16:59:07 nia Exp $
2 2
3DISTNAME= 7kaa-2.15.2 3DISTNAME= 7kaa-2.15.3
4PKGREVISION= 4 
5CATEGORIES= games 4CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_GITHUB:=the3dfxdude/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=the3dfxdude/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
9 8
10MAINTAINER= cfkoch@edgebsd.org 9MAINTAINER= cfkoch@edgebsd.org
11HOMEPAGE= https://7kfans.com/ 10HOMEPAGE= https://7kfans.com/
12COMMENT= Seven Kingdoms: Ancient Adversaries 11COMMENT= Seven Kingdoms: Ancient Adversaries
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils 14TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
16 15
17USE_LANGUAGES+= c c++11 16USE_LANGUAGES+= c c++11
cvs diff -r1.2 -r1.3 pkgsrc/games/7kaa/PLIST (expand / switch to unified diff)

--- pkgsrc/games/7kaa/PLIST 2019/11/30 11:47:15 1.2
+++ pkgsrc/games/7kaa/PLIST 2020/01/08 16:59:07 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2019/11/30 11:47:15 nia Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/01/08 16:59:07 nia Exp $
2bin/7kaa 2bin/7kaa
3share/7kaa/ENCYC/FIRM/FACTORY.COL 3share/7kaa/ENCYC/FIRM/FACTORY.COL
4share/7kaa/ENCYC/FIRM/FACTORY.ICN 4share/7kaa/ENCYC/FIRM/FACTORY.ICN
5share/7kaa/ENCYC/FIRM/FORT.COL 5share/7kaa/ENCYC/FIRM/FORT.COL
6share/7kaa/ENCYC/FIRM/FORT.ICN 6share/7kaa/ENCYC/FIRM/FORT.ICN
7share/7kaa/ENCYC/FIRM/HARBOR.COL 7share/7kaa/ENCYC/FIRM/HARBOR.COL
8share/7kaa/ENCYC/FIRM/HARBOR.ICN 8share/7kaa/ENCYC/FIRM/HARBOR.ICN
9share/7kaa/ENCYC/FIRM/INN.COL 9share/7kaa/ENCYC/FIRM/INN.COL
10share/7kaa/ENCYC/FIRM/INN.ICN 10share/7kaa/ENCYC/FIRM/INN.ICN
11share/7kaa/ENCYC/FIRM/MARKET.COL 11share/7kaa/ENCYC/FIRM/MARKET.COL
12share/7kaa/ENCYC/FIRM/MARKET.ICN 12share/7kaa/ENCYC/FIRM/MARKET.ICN
13share/7kaa/ENCYC/FIRM/MINE.COL 13share/7kaa/ENCYC/FIRM/MINE.COL
14share/7kaa/ENCYC/FIRM/MINE.ICN 14share/7kaa/ENCYC/FIRM/MINE.ICN
@@ -300,26 +300,27 @@ share/7kaa/SCENARI2/SCN_11.SCP @@ -300,26 +300,27 @@ share/7kaa/SCENARI2/SCN_11.SCP
300share/7kaa/SCENARI2/SCN_11.SCT 300share/7kaa/SCENARI2/SCN_11.SCT
301share/7kaa/SCENARI2/SCN_12.SCN 301share/7kaa/SCENARI2/SCN_12.SCN
302share/7kaa/SCENARI2/SCN_12.SCP 302share/7kaa/SCENARI2/SCN_12.SCP
303share/7kaa/SCENARI2/SCN_12.SCT 303share/7kaa/SCENARI2/SCN_12.SCT
304share/7kaa/SCENARI2/SCN_13.SCN 304share/7kaa/SCENARI2/SCN_13.SCN
305share/7kaa/SCENARI2/SCN_13.SCP 305share/7kaa/SCENARI2/SCN_13.SCP
306share/7kaa/SCENARI2/SCN_13.SCT 306share/7kaa/SCENARI2/SCN_13.SCT
307share/7kaa/SCENARI2/SCN_14.SCN 307share/7kaa/SCENARI2/SCN_14.SCN
308share/7kaa/SCENARI2/SCN_14.SCP 308share/7kaa/SCENARI2/SCN_14.SCP
309share/7kaa/SCENARI2/SCN_14.SCT 309share/7kaa/SCENARI2/SCN_14.SCT
310share/7kaa/SCENARI2/SCN_15.SCN 310share/7kaa/SCENARI2/SCN_15.SCN
311share/7kaa/SCENARI2/SCN_15.SCP 311share/7kaa/SCENARI2/SCN_15.SCP
312share/7kaa/SCENARI2/SCN_15.SCT 312share/7kaa/SCENARI2/SCN_15.SCT
 313share/7kaa/SCENARI2/config.txt
313share/7kaa/SCENARIO/7FOR7.SCN 314share/7kaa/SCENARIO/7FOR7.SCN
314share/7kaa/SCENARIO/7FOR7.SCP 315share/7kaa/SCENARIO/7FOR7.SCP
315share/7kaa/SCENARIO/7FOR7.SCT 316share/7kaa/SCENARIO/7FOR7.SCT
316share/7kaa/SCENARIO/C&D.SCN 317share/7kaa/SCENARIO/C&D.SCN
317share/7kaa/SCENARIO/C&D.SCP 318share/7kaa/SCENARIO/C&D.SCP
318share/7kaa/SCENARIO/C&D.SCT 319share/7kaa/SCENARIO/C&D.SCT
319share/7kaa/SCENARIO/DESBOW.SCN 320share/7kaa/SCENARIO/DESBOW.SCN
320share/7kaa/SCENARIO/DESBOW.SCP 321share/7kaa/SCENARIO/DESBOW.SCP
321share/7kaa/SCENARIO/DESBOW.SCT 322share/7kaa/SCENARIO/DESBOW.SCT
322share/7kaa/SCENARIO/DESPERDO.SCN 323share/7kaa/SCENARIO/DESPERDO.SCN
323share/7kaa/SCENARIO/DESPERDO.SCP 324share/7kaa/SCENARIO/DESPERDO.SCP
324share/7kaa/SCENARIO/DESPERDO.SCT 325share/7kaa/SCENARIO/DESPERDO.SCT
325share/7kaa/SCENARIO/ERADICAT.SCN 326share/7kaa/SCENARIO/ERADICAT.SCN
@@ -369,26 +370,27 @@ share/7kaa/SCENARIO/QUESUCCN.SCP @@ -369,26 +370,27 @@ share/7kaa/SCENARIO/QUESUCCN.SCP
369share/7kaa/SCENARIO/QUESUCCN.SCT 370share/7kaa/SCENARIO/QUESUCCN.SCT
370share/7kaa/SCENARIO/RESDEP.SCN 371share/7kaa/SCENARIO/RESDEP.SCN
371share/7kaa/SCENARIO/RESDEP.SCP 372share/7kaa/SCENARIO/RESDEP.SCP
372share/7kaa/SCENARIO/RESDEP.SCT 373share/7kaa/SCENARIO/RESDEP.SCT
373share/7kaa/SCENARIO/TREADCAR.SCN 374share/7kaa/SCENARIO/TREADCAR.SCN
374share/7kaa/SCENARIO/TREADCAR.SCP 375share/7kaa/SCENARIO/TREADCAR.SCP
375share/7kaa/SCENARIO/TREADCAR.SCT 376share/7kaa/SCENARIO/TREADCAR.SCT
376share/7kaa/SCENARIO/VIKBLITZ.SCN 377share/7kaa/SCENARIO/VIKBLITZ.SCN
377share/7kaa/SCENARIO/VIKBLITZ.SCP 378share/7kaa/SCENARIO/VIKBLITZ.SCP
378share/7kaa/SCENARIO/VIKBLITZ.SCT 379share/7kaa/SCENARIO/VIKBLITZ.SCT
379share/7kaa/SCENARIO/WEAKENED.SCN 380share/7kaa/SCENARIO/WEAKENED.SCN
380share/7kaa/SCENARIO/WEAKENED.SCP 381share/7kaa/SCENARIO/WEAKENED.SCP
381share/7kaa/SCENARIO/WEAKENED.SCT 382share/7kaa/SCENARIO/WEAKENED.SCT
 383share/7kaa/SCENARIO/config.txt
382share/7kaa/SOUND/FIRE.WAV 384share/7kaa/SOUND/FIRE.WAV
383share/7kaa/SOUND/QUAKE.WAV 385share/7kaa/SOUND/QUAKE.WAV
384share/7kaa/SOUND/RAIN.WAV 386share/7kaa/SOUND/RAIN.WAV
385share/7kaa/SOUND/THUNDER.WAV 387share/7kaa/SOUND/THUNDER.WAV
386share/7kaa/SOUND/WIND.WAV 388share/7kaa/SOUND/WIND.WAV
387share/7kaa/SPRITE/BAATEZU.SPR 389share/7kaa/SPRITE/BAATEZU.SPR
388share/7kaa/SPRITE/BALLISTA.SPR 390share/7kaa/SPRITE/BALLISTA.SPR
389share/7kaa/SPRITE/CANBALL.SPR 391share/7kaa/SPRITE/CANBALL.SPR
390share/7kaa/SPRITE/CANBALLA.SPR 392share/7kaa/SPRITE/CANBALLA.SPR
391share/7kaa/SPRITE/CANBALLS.SPR 393share/7kaa/SPRITE/CANBALLS.SPR
392share/7kaa/SPRITE/CANNON.SPR 394share/7kaa/SPRITE/CANNON.SPR
393share/7kaa/SPRITE/CANSMOKE.SPR 395share/7kaa/SPRITE/CANSMOKE.SPR
394share/7kaa/SPRITE/CARAVAN.SPR 396share/7kaa/SPRITE/CARAVAN.SPR
@@ -484,21 +486,22 @@ share/7kaa/SPRITE/ZU_GOD.SPR @@ -484,21 +486,22 @@ share/7kaa/SPRITE/ZU_GOD.SPR
484share/7kaa/TUTORIAL/10CAPTUR.TUT 486share/7kaa/TUTORIAL/10CAPTUR.TUT
485share/7kaa/TUTORIAL/1BAS_MIL.TUT 487share/7kaa/TUTORIAL/1BAS_MIL.TUT
486share/7kaa/TUTORIAL/2BAS_ECO.TUT 488share/7kaa/TUTORIAL/2BAS_ECO.TUT
487share/7kaa/TUTORIAL/2B_TRADE.TUT 489share/7kaa/TUTORIAL/2B_TRADE.TUT
488share/7kaa/TUTORIAL/3RESEARC.TUT 490share/7kaa/TUTORIAL/3RESEARC.TUT
489share/7kaa/TUTORIAL/4WEAPONS.TUT 491share/7kaa/TUTORIAL/4WEAPONS.TUT
490share/7kaa/TUTORIAL/5BAS_NAV.TUT 492share/7kaa/TUTORIAL/5BAS_NAV.TUT
491share/7kaa/TUTORIAL/6SEATRAD.TUT 493share/7kaa/TUTORIAL/6SEATRAD.TUT
492share/7kaa/TUTORIAL/7MERCENA.TUT 494share/7kaa/TUTORIAL/7MERCENA.TUT
493share/7kaa/TUTORIAL/8FRYHTAN.TUT 495share/7kaa/TUTORIAL/8FRYHTAN.TUT
494share/7kaa/TUTORIAL/9SEATPOW.TUT 496share/7kaa/TUTORIAL/9SEATPOW.TUT
495share/7kaa/TUTORIAL/LOYALTY.TUT 497share/7kaa/TUTORIAL/LOYALTY.TUT
496share/7kaa/TUTORIAL/SPYING.TUT 498share/7kaa/TUTORIAL/SPYING.TUT
 499share/7kaa/TUTORIAL/config.txt
497share/applications/7kaa.desktop 500share/applications/7kaa.desktop
498share/doc/7kaa/COPYING 501share/doc/7kaa/COPYING
499share/doc/7kaa/README 502share/doc/7kaa/README
500share/locale/de/LC_MESSAGES/7kaa.mo 503share/locale/de/LC_MESSAGES/7kaa.mo
501share/locale/es/LC_MESSAGES/7kaa.mo 504share/locale/es/LC_MESSAGES/7kaa.mo
502share/locale/pt_BR/LC_MESSAGES/7kaa.mo 505share/locale/pt_BR/LC_MESSAGES/7kaa.mo
503share/locale/ru/LC_MESSAGES/7kaa.mo 506share/locale/ru/LC_MESSAGES/7kaa.mo
504share/pixmaps/7kaa.png 507share/pixmaps/7kaa.png
cvs diff -r1.3 -r1.4 pkgsrc/games/7kaa/distinfo (expand / switch to unified diff)

--- pkgsrc/games/7kaa/distinfo 2019/10/25 10:00:58 1.3
+++ pkgsrc/games/7kaa/distinfo 2020/01/08 16:59:07 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2019/10/25 10:00:58 kamil Exp $ 1$NetBSD: distinfo,v 1.4 2020/01/08 16:59:07 nia Exp $
2 2
3SHA1 (7kaa-2.15.2.tar.xz) = 12ee27dc4f49e969edfff7593b06ac47f22ca6b7 3SHA1 (7kaa-2.15.3.tar.xz) = 25f680eb2e11e53bc04d6b9ecd5bc679b5b3cd22
4RMD160 (7kaa-2.15.2.tar.xz) = 39a358665bb5e88643d124cdee70da6558a50ca9 4RMD160 (7kaa-2.15.3.tar.xz) = e48c20243efa42775d9fd2c452b01aa364082b8d
5SHA512 (7kaa-2.15.2.tar.xz) = df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a 5SHA512 (7kaa-2.15.3.tar.xz) = 8881f73d1182bdeb6676484f9bf3cf3e48defda5cc40d9864fe3425c27666d2ace8e566052c0d8d1e00f5c9e1a044660653e5851513a00e656c975450a765554
6Size (7kaa-2.15.2.tar.xz) = 46821276 bytes 6Size (7kaa-2.15.3.tar.xz) = 46852980 bytes
7SHA1 (patch-src_LocaleRes.cpp) = e7d1be36769b225912930960771dab9ea6290e72 7SHA1 (patch-src_LocaleRes.cpp) = c1e8f370d0add3ef744aa430fab2ce11424dcdec
cvs diff -r1.3 -r1.4 pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp (expand / switch to unified diff)

--- pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp 2019/10/25 10:00:58 1.3
+++ pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp 2020/01/08 16:59:07 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-src_LocaleRes.cpp,v 1.3 2019/10/25 10:00:58 kamil Exp $ 1$NetBSD: patch-src_LocaleRes.cpp,v 1.4 2020/01/08 16:59:07 nia Exp $
2 2
3Support NetBSD and SunOS iconv being special. 3Support NetBSD and SunOS iconv being special.
4 4
5--- src/LocaleRes.cpp.orig 2019-06-22 22:22:26.000000000 +0000 5--- src/LocaleRes.cpp.orig 2019-12-22 22:27:28.000000000 +0000
6+++ src/LocaleRes.cpp 6+++ src/LocaleRes.cpp
7@@ -30,6 +30,15 @@ 7@@ -31,6 +31,15 @@
8 #include <ODB.h> 8 #include <ConfigAdv.h>
9 #include <LocaleRes.h> 9 #include <LocaleRes.h>
10  10
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+#include <sys/param.h> 12+#include <sys/param.h>
13+#if __NetBSD_Prereq__(9,99,17) 13+#if __NetBSD_Prereq__(9,99,17)
14+#define NETBSD_POSIX_ICONV 1 14+#define NETBSD_POSIX_ICONV 1
15+#else 15+#else
16+#define NETBSD_POSIX_ICONV 0 16+#define NETBSD_POSIX_ICONV 0
17+#endif 17+#endif
18+#endif 18+#endif
19+ 19+
20 //------------- End of function Constructor -------// 20 //------------- End of function Constructor -------//
21 // 21 //
22 LocaleRes::LocaleRes() 22 LocaleRes::LocaleRes()
23@@ -169,7 +178,11 @@ const char *LocaleRes::conv_str(iconv_t  23@@ -191,7 +200,11 @@ const char *LocaleRes::conv_str(iconv_t
24 size_t c; 24 size_t c;
25 while( in_left>0 ) 25 while( in_left>0 )
26 { 26 {
27+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun) 27+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
28+ c = iconv(cd, (const char **)&p1, &in_left, &p2, &out_left); 28+ c = iconv(cd, (const char **)&p1, &in_left, &p2, &out_left);
29+#else 29+#else
30 c = iconv(cd, &p1, &in_left, &p2, &out_left); 30 c = iconv(cd, &p1, &in_left, &p2, &out_left);
31+#endif 31+#endif
32 if( c == (size_t)-1 ) 32 if( c == (size_t)-1 )
33 return s; 33 return s;
34 if( in_left ) 34 if( in_left )