diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2004-05-12 18:53:07 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2004-05-12 18:53:07 +0000 |
| commit | 0a88456a6ac27fd016c7ee89a3b506eb4efca840 (patch) | |
| tree | 80dccab8e47ca90aed27878960da1c9b3f1e558e /games | |
| parent | Per maintainer, mark DEPRECATED and drop maintainership. Since many (diff) | |
Fix the build on 4.x. The problem was that the definition of the std::wstring
class is commented out on FreeBSD 4 because <cwctype> is missing. Tim Robbin
has shown the workaround for this in freebsd-stable. Also, remove USE_GCC=3.3
and it can build on 4.x's default GCC 2.9x now.
Reported by: bento via kris
Tested by: pav and Rashid N. Achilov <shelton@sentry.granch.ru>
Approved by: adamw (mentor)
Notes
Notes:
svn path=/head/; revision=109029
Diffstat (limited to 'games')
| -rw-r--r-- | games/wesnoth-devel/Makefile | 1 | ||||
| -rw-r--r-- | games/wesnoth-devel/files/patch-src::language.hpp | 17 | ||||
| -rw-r--r-- | games/wesnoth-devel/files/patch-src::widgets::textbox.hpp | 17 | ||||
| -rw-r--r-- | games/wesnoth/Makefile | 1 | ||||
| -rw-r--r-- | games/wesnoth/files/patch-src::language.hpp | 17 | ||||
| -rw-r--r-- | games/wesnoth/files/patch-src::widgets::textbox.hpp | 17 |
6 files changed, 68 insertions, 2 deletions
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile index 3e4cbd290870..4fe63e9f9aca 100644 --- a/games/wesnoth-devel/Makefile +++ b/games/wesnoth-devel/Makefile @@ -17,7 +17,6 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= mezz@FreeBSD.org COMMENT= A fantasy turn-based strategy game -USE_GCC= 3.3 USE_SDL= image mixer net ttf USE_GNOME= gnometarget WANT_GNOME= yes diff --git a/games/wesnoth-devel/files/patch-src::language.hpp b/games/wesnoth-devel/files/patch-src::language.hpp new file mode 100644 index 000000000000..8ab1e88d877f --- /dev/null +++ b/games/wesnoth-devel/files/patch-src::language.hpp @@ -0,0 +1,17 @@ +--- src/language.hpp.orig Mon May 3 18:35:49 2004 ++++ src/language.hpp Wed May 12 00:50:43 2004 +@@ -19,6 +19,14 @@ + #include <string> + #include <vector> + ++#if (__FreeBSD_version < 500029) ++#include <cwchar> ++namespace std ++{ ++ typedef basic_string <wchar_t> wstring; ++} ++#endif ++ + //this module controls internationalization. + + struct symbol_table diff --git a/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp b/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp new file mode 100644 index 000000000000..6abbf1e960b2 --- /dev/null +++ b/games/wesnoth-devel/files/patch-src::widgets::textbox.hpp @@ -0,0 +1,17 @@ +--- src/widgets/textbox.hpp.orig Mon May 3 18:35:49 2004 ++++ src/widgets/textbox.hpp Wed May 12 00:51:03 2004 +@@ -22,6 +22,14 @@ + + #include "SDL.h" + ++#if (__FreeBSD_version < 500029) ++#include <cwchar> ++namespace std ++{ ++ typedef basic_string <wchar_t> wstring; ++} ++#endif ++ + namespace gui { + + class textbox : public widget diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 3e4cbd290870..4fe63e9f9aca 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -17,7 +17,6 @@ DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= mezz@FreeBSD.org COMMENT= A fantasy turn-based strategy game -USE_GCC= 3.3 USE_SDL= image mixer net ttf USE_GNOME= gnometarget WANT_GNOME= yes diff --git a/games/wesnoth/files/patch-src::language.hpp b/games/wesnoth/files/patch-src::language.hpp new file mode 100644 index 000000000000..8ab1e88d877f --- /dev/null +++ b/games/wesnoth/files/patch-src::language.hpp @@ -0,0 +1,17 @@ +--- src/language.hpp.orig Mon May 3 18:35:49 2004 ++++ src/language.hpp Wed May 12 00:50:43 2004 +@@ -19,6 +19,14 @@ + #include <string> + #include <vector> + ++#if (__FreeBSD_version < 500029) ++#include <cwchar> ++namespace std ++{ ++ typedef basic_string <wchar_t> wstring; ++} ++#endif ++ + //this module controls internationalization. + + struct symbol_table diff --git a/games/wesnoth/files/patch-src::widgets::textbox.hpp b/games/wesnoth/files/patch-src::widgets::textbox.hpp new file mode 100644 index 000000000000..6abbf1e960b2 --- /dev/null +++ b/games/wesnoth/files/patch-src::widgets::textbox.hpp @@ -0,0 +1,17 @@ +--- src/widgets/textbox.hpp.orig Mon May 3 18:35:49 2004 ++++ src/widgets/textbox.hpp Wed May 12 00:51:03 2004 +@@ -22,6 +22,14 @@ + + #include "SDL.h" + ++#if (__FreeBSD_version < 500029) ++#include <cwchar> ++namespace std ++{ ++ typedef basic_string <wchar_t> wstring; ++} ++#endif ++ + namespace gui { + + class textbox : public widget |