Thu Feb 24 13:36:57 2011 UTC ()
Changes 1.8.5:
* AI:
  * Fixed bug 16406: Fixed broken AI of SoF 1, and improved upgrade procedure
    for old-style AI config.
  * Fixed bug 16585: made AI move in targeting phase even if for some of the
    'best' units moves to targets are impossible
* Campaigns:
  * Descent into Darkness:
    * Made 'Alone at Last' easier.
  * Legend of Wesmere:
    * Added another keep in scenario 14.
* Editor:
  * Added a standard click sound for brush bar buttons (bug 15635)
* Graphics
  * Updated portraits for Drake Fighter and Burner
* Language and i18n:
  * Updates fonts: DejaVu 2.32
  * Updated translations: Chinese (Simplified), Chinese (Traditional), Czech,
    Dutch, Estonian, French, Galician, German, Hungarian, Indonesian, Japanese,
    Lithuanian, Polish, Russian, Serbian, Slovak, Vietnamese
* User interface:
  * Fixed bug 16653: Avoid markup when calculating the text length for
    ellipse text (Debian bug 547476).
  * Fix bug 15960 "again", making "Cancel" a separate action and not just
    a duplicate of "OK."
  * Fix crash when doing teleport+attack to a fogged village


(adam)
diff -r1.63 -r1.64 pkgsrc/games/wesnoth/Makefile
diff -r1.32 -r1.33 pkgsrc/games/wesnoth/PLIST
diff -r1.41 -r1.42 pkgsrc/games/wesnoth/distinfo
diff -r1.13 -r1.14 pkgsrc/games/wesnoth/patches/patch-aa
diff -r0 -r1.14 pkgsrc/games/wesnoth/patches/patch-ac
diff -r1.7 -r1.8 pkgsrc/games/wesnoth/patches/patch-ag
diff -r1.1 -r1.2 pkgsrc/games/wesnoth/patches/patch-ah
cvs diff -r1.63 -r1.64 pkgsrc/games/wesnoth/Makefile (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/Makefile 2011/01/13 13:37:53 1.63
+++ pkgsrc/games/wesnoth/Makefile 2011/02/24 13:36:56 1.64
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.63 2011/01/13 13:37:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.64 2011/02/24 13:36:56 adam Exp $
2 2
3DISTNAME= wesnoth-1.8.4 3DISTNAME= wesnoth-1.8.5
4PKGREVISION= 2 
5CATEGORIES= games 4CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.wesnoth.org/ 9HOMEPAGE= http://www.wesnoth.org/
11COMMENT= Fantasy turn-based strategy game 10COMMENT= Fantasy turn-based strategy game
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 13BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
@@ -44,27 +43,27 @@ SUBST_MESSAGE.python= Fixing path to pyt @@ -44,27 +43,27 @@ SUBST_MESSAGE.python= Fixing path to pyt
44# Best we can do without pulling in a python dependency. 43# Best we can do without pulling in a python dependency.
45SUBST_SED.python+= -e 's,WPY,${PREFIX}/bin/python2.6,' 44SUBST_SED.python+= -e 's,WPY,${PREFIX}/bin/python2.6,'
46SUBST_SED.python+= -e 's,/bin/env.*python,${PREFIX}/bin/python2.6,' 45SUBST_SED.python+= -e 's,/bin/env.*python,${PREFIX}/bin/python2.6,'
47SUBST_SED.python+= -e 's,/usr/bin/python,${PREFIX}/bin/python2.6,' 46SUBST_SED.python+= -e 's,/usr/bin/python,${PREFIX}/bin/python2.6,'
48 47
49REPLACE_RUBY= data/tools/terrain2wiki.rb 48REPLACE_RUBY= data/tools/terrain2wiki.rb
50.include "../../lang/ruby/replace.mk" 49.include "../../lang/ruby/replace.mk"
51 50
52REPLACE_SH+= data/tools/castle-cutter/mk-castle.sh 51REPLACE_SH+= data/tools/castle-cutter/mk-castle.sh
53REPLACE_SH+= data/tools/castle-cutter/mk-all-castles.sh 52REPLACE_SH+= data/tools/castle-cutter/mk-all-castles.sh
54 53
55.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
56.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*) 55.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*)
57USE_TOOLS+= gmake 56USE_TOOLS+= gmake
58.endif 57.endif
59 58
60pre-configure: 59pre-configure:
61 set -e; cd ${WRKSRC}; \ 60 set -e; cd ${WRKSRC}; \
62 aclocal -I m4; autoheader; automake -a --foreign -i; autoconf 61 aclocal -I m4; autoheader; automake -a --foreign -i; autoconf
63 62
64BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3 63BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3
65.include "../../audio/SDL_mixer/buildlink3.mk" 64.include "../../audio/SDL_mixer/buildlink3.mk"
66.include "../../converters/fribidi/buildlink3.mk" 65.include "../../converters/fribidi/buildlink3.mk"
67BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.7 66BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.7
68.include "../../devel/SDL/buildlink3.mk" 67.include "../../devel/SDL/buildlink3.mk"
69BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.8 68BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.8
70.include "../../devel/SDL_ttf/buildlink3.mk" 69.include "../../devel/SDL_ttf/buildlink3.mk"
cvs diff -r1.32 -r1.33 pkgsrc/games/wesnoth/PLIST (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/PLIST 2010/08/28 20:08:40 1.32
+++ pkgsrc/games/wesnoth/PLIST 2011/02/24 13:36:56 1.33
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1@comment $NetBSD: PLIST,v 1.32 2010/08/28 20:08:40 adam Exp $ 1@comment $NetBSD: PLIST,v 1.33 2011/02/24 13:36:56 adam Exp $
2@pkgdir var/run/wesnothd 2@pkgdir var/run/wesnothd
3bin/wesnoth 3bin/wesnoth
4bin/wesnothd 4bin/wesnothd
5man/cs/man6/wesnoth.6 5man/cs/man6/wesnoth.6
6man/cs/man6/wesnothd.6 6man/cs/man6/wesnothd.6
7man/de/man6/wesnoth.6 7man/de/man6/wesnoth.6
8man/de/man6/wesnothd.6 8man/de/man6/wesnothd.6
9man/en_GB/man6/wesnoth.6 9man/en_GB/man6/wesnoth.6
10man/en_GB/man6/wesnothd.6 10man/en_GB/man6/wesnothd.6
11man/es/man6/wesnoth.6 11man/es/man6/wesnoth.6
12man/es/man6/wesnothd.6 12man/es/man6/wesnothd.6
13man/et/man6/wesnoth.6 13man/et/man6/wesnoth.6
14man/et/man6/wesnothd.6 14man/et/man6/wesnothd.6
15man/fi/man6/wesnoth.6 15man/fi/man6/wesnoth.6
16man/fi/man6/wesnothd.6 16man/fi/man6/wesnothd.6
17man/fr/man6/wesnoth.6 17man/fr/man6/wesnoth.6
18man/fr/man6/wesnothd.6 18man/fr/man6/wesnothd.6
19man/gl/man6/wesnoth.6 19man/gl/man6/wesnoth.6
20man/gl/man6/wesnothd.6 20man/gl/man6/wesnothd.6
21man/hu/man6/wesnoth.6 21man/hu/man6/wesnoth.6
22man/hu/man6/wesnothd.6 22man/hu/man6/wesnothd.6
 23man/id/man6/wesnoth.6
 24man/id/man6/wesnothd.6
23man/it/man6/wesnoth.6 25man/it/man6/wesnoth.6
24man/it/man6/wesnothd.6 26man/it/man6/wesnothd.6
25man/ja/man6/wesnoth.6 27man/ja/man6/wesnoth.6
26man/ja/man6/wesnothd.6 28man/ja/man6/wesnothd.6
27man/lt/man6/wesnoth.6 29man/lt/man6/wesnoth.6
28man/lt/man6/wesnothd.6 30man/lt/man6/wesnothd.6
29man/man6/wesnoth.6 31man/man6/wesnoth.6
30man/man6/wesnothd.6 32man/man6/wesnothd.6
31man/pl/man6/wesnoth.6 33man/pl/man6/wesnoth.6
32man/pl/man6/wesnothd.6 34man/pl/man6/wesnothd.6
33man/pt_BR/man6/wesnoth.6 35man/pt_BR/man6/wesnoth.6
34man/pt_BR/man6/wesnothd.6 36man/pt_BR/man6/wesnothd.6
35man/sk/man6/wesnoth.6 37man/sk/man6/wesnoth.6
cvs diff -r1.41 -r1.42 pkgsrc/games/wesnoth/distinfo (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/distinfo 2010/08/30 19:29:25 1.41
+++ pkgsrc/games/wesnoth/distinfo 2011/02/24 13:36:56 1.42
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.41 2010/08/30 19:29:25 adam Exp $ 1$NetBSD: distinfo,v 1.42 2011/02/24 13:36:56 adam Exp $
2 2
3SHA1 (wesnoth-1.8.4.tar.bz2) = 30b82e06523f9a82b770a6fc4e2d4251bd358eca 3SHA1 (wesnoth-1.8.5.tar.bz2) = 22c6cc10dc7172daf636158dba0acac35f538597
4RMD160 (wesnoth-1.8.4.tar.bz2) = 86b6f6ca39cf87134d89e989ed20840836aeac28 4RMD160 (wesnoth-1.8.5.tar.bz2) = c2a6a9f094b862ef274838fd062c5d961f97c261
5Size (wesnoth-1.8.4.tar.bz2) = 300557790 bytes 5Size (wesnoth-1.8.5.tar.bz2) = 301024033 bytes
6SHA1 (patch-aa) = 363dead4e4a6974db5a2d71a460e60404cc1246a 6SHA1 (patch-aa) = 17ffae20b02ccdaed6f465c988d330e4890df76c
 7SHA1 (patch-ac) = 41d23e2103fd3c3e0f085b0164e9f29bcb8d024c
7SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18 8SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18
8SHA1 (patch-af) = d3554b1c164ff95ee2b86c17990ed236f0e00c32 9SHA1 (patch-af) = d3554b1c164ff95ee2b86c17990ed236f0e00c32
9SHA1 (patch-ag) = 9a843d4fa2f011b69ee140dceaac3d56d1fe44f9 10SHA1 (patch-ag) = 624f54980f894af0ad98f4a83ada344bf51dbc77
10SHA1 (patch-ah) = ca06ab21724812290c4f4785cfbd42d3406202fb 11SHA1 (patch-ah) = 6fd2cc1de4929704bb770dcabe1f32f9257529a1
cvs diff -r1.13 -r1.14 pkgsrc/games/wesnoth/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/patches/Attic/patch-aa 2010/08/28 20:08:40 1.13
+++ pkgsrc/games/wesnoth/patches/Attic/patch-aa 2011/02/24 13:36:57 1.14
@@ -1,13 +1,27 @@ @@ -1,13 +1,27 @@
1$NetBSD: patch-aa,v 1.13 2010/08/28 20:08:40 adam Exp $ 1$NetBSD: patch-aa,v 1.14 2011/02/24 13:36:57 adam Exp $
2 2
3--- configure.ac.orig 2010-08-28 17:03:00.000000000 +0000 3Do not check compiler version. Clang impersonates GCC and might get caught.
 4Do not treat warnings as errors.
 5
 6--- configure.ac.orig 2010-09-24 17:37:41.000000000 +0000
4+++ configure.ac 7+++ configure.ac
5@@ -111,7 +111,7 @@ then 8@@ -64,10 +64,6 @@ parts=`echo $GCC_VERSION | tr '.' ' '`
 9 set $parts
 10 GCC_MAJOR_VERSION=$1
 11 GCC_MINOR_VERSION=$2
 12-if test ${GCC_MAJOR_VERSION}${GCC_MINOR_VERSION} -lt 33
 13-then
 14- AC_MSG_ERROR([*** G++ major version $GCC_VERSION is too old.])
 15-fi
 16
 17 #######################################################################
 18 # Configuration options #
 19@@ -111,7 +107,7 @@ then
6 # CFLAGS="-Werror -Wno-unused -Wno-sign-compare $CFLAGS" 20 # CFLAGS="-Werror -Wno-unused -Wno-sign-compare $CFLAGS"
7  21
8 # The current networking code breaks strict aliasing in g++ 4.5. 22 # The current networking code breaks strict aliasing in g++ 4.5.
9- CXXFLAGS="-Werror -Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS" 23- CXXFLAGS="-Werror -Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
10+ CXXFLAGS="-Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS" 24+ CXXFLAGS="-Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
11 fi 25 fi
12  26
13 # Make tests default in svn version 27 # Make tests default in svn version
File Added: pkgsrc/games/wesnoth/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.14 2011/02/24 13:36:57 adam Exp $

Fix C++ error.

--- src/gui/auxiliary/event/dispatcher_private.hpp.orig	2011-02-24 12:38:36.000000000 +0000
+++ src/gui/auxiliary/event/dispatcher_private.hpp
@@ -319,7 +319,6 @@ struct find<false>
 			// MSVC 2008 doesn't like operator() here so changed the name.
 			return functor.template oper<item>(event);
 		} else {
-			typedef typename boost::mpl::next<itor>::type itor;
 			return find<boost::is_same<itor, end>::value>
 				::execute((itor*)0, (end*)0, event, functor);
 		}
cvs diff -r1.7 -r1.8 pkgsrc/games/wesnoth/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/patches/Attic/patch-ag 2010/08/30 19:29:26 1.7
+++ pkgsrc/games/wesnoth/patches/Attic/patch-ag 2011/02/24 13:36:57 1.8
@@ -1,107 +1,15 @@ @@ -1,107 +1,15 @@
1$NetBSD: patch-ag,v 1.7 2010/08/30 19:29:26 adam Exp $ 1$NetBSD: patch-ag,v 1.8 2011/02/24 13:36:57 adam Exp $
2 2
3On MacOSX use Pasteboard Manager instead of deprecated Scrap Manager. 3Fix C++ error.
4For details, see http://gna.org/bugs/?16576 
5 4
6--- src/clipboard.cpp.orig 2010-02-06 10:50:29.000000000 +0000 5--- src/ai/composite/aspect.hpp.orig 2011-02-24 12:25:20.000000000 +0000
7+++ src/clipboard.cpp 6+++ src/ai/composite/aspect.hpp
8@@ -26,6 +26,8 @@ 7@@ -282,7 +282,7 @@ public:
 8 boost::function2<void, typename aspect_type<T>::typesafe_ptr_vector&, const config&> factory_facets =
 9 boost::bind(&ai::composite_aspect<T>::create_facet,*this,_1,_2);
9  10
10 #include "SDL_syswm.h" 11- register_vector_property("facet",facets_, factory_facets);
 12+ this->register_vector_property("facet",facets_, factory_facets);
11  13
12+#include <unistd.h> 
13+ 
14 /** 
15 The following are two classes which wrap the SDL's interface to X, 
16 including locking/unlocking, and which manage the atom internment. 
17@@ -483,7 +485,7 @@ void copy_to_clipboard(const std::string 
18 { 
19 std::string new_str; 
20 new_str.reserve(text.size()); 
21- for (int i = 0; i < text.size(); ++i) 
22+ for (unsigned int i = 0; i < text.size(); ++i) 
23 { 
24 if (text[i] == '\n') 
25 { 
26@@ -493,33 +495,64 @@ void copy_to_clipboard(const std::string 
27 } 
28 } 14 }
29 OSStatus err = noErr; 
30- ScrapRef scrap = kScrapRefNone; 
31- err = ClearCurrentScrap(); 
32+ PasteboardRef clipboard; 
33+ PasteboardSyncFlags syncFlags; 
34+ CFDataRef textData = NULL; 
35+ err = PasteboardCreate(kPasteboardClipboard, &clipboard); 
36 if (err != noErr) return; 
37- err = GetCurrentScrap(&scrap); 
38+ err = PasteboardClear(clipboard); 
39 if (err != noErr) return; 
40- PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone, text.size(), new_str.c_str()); 
41+ syncFlags = PasteboardSynchronize(clipboard); 
42+ if ((syncFlags&kPasteboardModified) && !(syncFlags&kPasteboardClientIsOwner)) return; 
43+ textData = CFDataCreate(kCFAllocatorDefault, (const UInt8 *)new_str.c_str(), text.size()); 
44+ PasteboardPutItemFlavor(clipboard, (PasteboardItemID)1, CFSTR("public.utf8-plain-text"), textData, 0); 
45 } 
46  15
47 std::string copy_from_clipboard(const bool) 
48 { 
49- ScrapRef curscrap = kScrapRefNone; 
50- Size scrapsize = 0; 
51 OSStatus err = noErr; 
52- err = GetCurrentScrap(&curscrap); 
53- if (err != noErr) return ""; 
54- err = GetScrapFlavorSize(curscrap, kScrapFlavorTypeText, &scrapsize); 
55+ PasteboardRef clipboard; 
56+ PasteboardSyncFlags syncFlags; 
57+ ItemCount count; 
58+ err = PasteboardCreate(kPasteboardClipboard, &clipboard); 
59 if (err != noErr) return ""; 
60- std::string str; 
61- str.reserve(scrapsize); 
62- str.resize(scrapsize); 
63- err = GetScrapFlavorData(curscrap, kScrapFlavorTypeText, &scrapsize, const_cast<char*>(str.data())); 
64+ syncFlags = PasteboardSynchronize(clipboard); 
65+ if (syncFlags&kPasteboardModified) return ""; 
66+ err = PasteboardGetItemCount(clipboard, &count); 
67 if (err != noErr) return ""; 
68- for (int i = 0; i < str.size(); ++i) 
69- { 
70- if (str[i] == '\r') str[i] = '\n'; 
71+ for (UInt32 k = 1; k <= count; k++) { 
72+ PasteboardItemID itemID; 
73+ CFArrayRef flavorTypeArray; 
74+ CFIndex flavorCount; 
75+ err = PasteboardGetItemIdentifier(clipboard, k, &itemID); 
76+ if (err != noErr) return ""; 
77+ err = PasteboardCopyItemFlavors(clipboard, itemID, &flavorTypeArray); 
78+ if (err != noErr) return ""; 
79+ flavorCount = CFArrayGetCount(flavorTypeArray); 
80+ for (CFIndex j = 0; j < flavorCount; j++) { 
81+ CFStringRef flavorType; 
82+ CFDataRef flavorData; 
83+ CFIndex flavorDataSize; 
84+ flavorType = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, j); 
85+ if (UTTypeConformsTo(flavorType, CFSTR("public.utf8-plain-text"))) { 
86+ err = PasteboardCopyItemFlavorData(clipboard, itemID, flavorType, &flavorData); 
87+ if (err != noErr) { 
88+ CFRelease(flavorTypeArray); 
89+ return ""; 
90+ } 
91+ flavorDataSize = CFDataGetLength(flavorData); 
92+ std::string str; 
93+ str.reserve(flavorDataSize); 
94+ str.resize(flavorDataSize); 
95+ CFDataGetBytes(flavorData, CFRangeMake(0, flavorDataSize), (UInt8 *)str.data()); 
96+ for (unsigned int i = 0; i < str.size(); ++i) { 
97+ if (str[i] == '\r') str[i] = '\n'; 
98+ } 
99+ return str; 
100+ } 
101+ } 
102 } 
103- return str; 
104+ return ""; 
105 } 
106  
107 void handle_system_event(const SDL_Event& event) 
cvs diff -r1.1 -r1.2 pkgsrc/games/wesnoth/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/games/wesnoth/patches/Attic/patch-ah 2010/08/28 20:08:40 1.1
+++ pkgsrc/games/wesnoth/patches/Attic/patch-ah 2011/02/24 13:36:57 1.2
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-ah,v 1.1 2010/08/28 20:08:40 adam Exp $ 1$NetBSD: patch-ah,v 1.2 2011/02/24 13:36:57 adam Exp $
2 2
3--- m4/boost.m4.orig 2010-05-27 07:42:52.000000000 +0000 3Fix C++ error.
4+++ m4/boost.m4 4
5@@ -463,7 +463,7 @@ AC_DEFUN([BOOST_GRAPH], 5--- src/controller_base.cpp.orig 2011-02-24 12:28:03.000000000 +0000
6 AC_DEFUN([BOOST_IOSTREAMS], 6+++ src/controller_base.cpp
7 [BOOST_FIND_LIB([iostreams], [$1], 7@@ -54,6 +54,7 @@ void controller_base::handle_event(const
8 [boost/iostreams/device/file_descriptor.hpp], 8 if(gui::in_dialog()) {
9- [boost::iostreams::file_descriptor fd(0); fd.close();]) 9 return;
10+ [boost::iostreams::file_descriptor fd("/dev/null"); fd.close();]) 10 }
11 ])# BOOST_IOSTREAMS 11+ SDL_Event new_event;
12  
13  12
 13 switch(event.type) {
 14 case SDL_KEYDOWN:
 15@@ -71,7 +72,6 @@ void controller_base::handle_event(const
 16 break;
 17 case SDL_MOUSEMOTION:
 18 // Ignore old mouse motion events in the event queue
 19- SDL_Event new_event;
 20 if(SDL_PeepEvents(&new_event,1,SDL_GETEVENT,
 21 SDL_EVENTMASK(SDL_MOUSEMOTION)) > 0) {
 22 while(SDL_PeepEvents(&new_event,1,SDL_GETEVENT,