diff options
| author | joerg <joerg> | 2015-04-25 00:56:03 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-04-25 00:56:03 +0000 |
| commit | cd5ca57cfe8b32a6c58029b7b6178f206276718b (patch) | |
| tree | 15d756a0c1755c10a7d8d1e65ce14530dee31924 /games | |
| parent | 2b3fa7a1caeb6adb73e56a9a9ab8bee4fe86f72a (diff) | |
| download | pkgsrc-cd5ca57cfe8b32a6c58029b7b6178f206276718b.tar.gz | |
Fix C++.
Diffstat (limited to 'games')
| -rw-r--r-- | games/exult/distinfo | 5 | ||||
| -rw-r--r-- | games/exult/patches/patch-imagewin_manip.h | 15 | ||||
| -rw-r--r-- | games/exult/patches/patch-istring.h | 29 | ||||
| -rw-r--r-- | games/exult/patches/patch-usecode_compiler_ucstmt.cc | 15 |
4 files changed, 63 insertions, 1 deletions
diff --git a/games/exult/distinfo b/games/exult/distinfo index 4a3f71682be..ca19c432a91 100644 --- a/games/exult/distinfo +++ b/games/exult/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.8 2015/04/19 19:30:12 wiz Exp $ +$NetBSD: distinfo,v 1.9 2015/04/25 00:56:03 joerg Exp $ SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792 RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914 Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093 +SHA1 (patch-imagewin_manip.h) = 1d79feccbd17633a5053197ebbf1c98a6e9d4de3 +SHA1 (patch-istring.h) = c6c236714e03c4da64afac79a4707e02d8d140cc +SHA1 (patch-usecode_compiler_ucstmt.cc) = ca404dcb3e5ba8f318c35fa95b7fb6b31a7f5fe9 diff --git a/games/exult/patches/patch-imagewin_manip.h b/games/exult/patches/patch-imagewin_manip.h new file mode 100644 index 00000000000..999a028eca7 --- /dev/null +++ b/games/exult/patches/patch-imagewin_manip.h @@ -0,0 +1,15 @@ +$NetBSD: patch-imagewin_manip.h,v 1.1 2015/04/25 00:56:04 joerg Exp $ + +Reference to member of base class must be explicit. + +--- imagewin/manip.h.orig 2015-04-25 00:01:37.000000000 +0000 ++++ imagewin/manip.h +@@ -319,7 +319,7 @@ public: + static uintD copy(uintS src) + { + unsigned int r, g, b; +- split_source(src,r,g,b); ++ ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b); + return ManipBaseDest<color_d>::rgb(r,g,b); + } + static void copy(uintD& dest, uintS src) diff --git a/games/exult/patches/patch-istring.h b/games/exult/patches/patch-istring.h new file mode 100644 index 00000000000..c76f1c54aad --- /dev/null +++ b/games/exult/patches/patch-istring.h @@ -0,0 +1,29 @@ +$NetBSD: patch-istring.h,v 1.1 2015/04/25 00:56:04 joerg Exp $ + +append does not depend on the template, so make reference explicit. + +--- istring.h.orig 2015-04-24 23:56:35.000000000 +0000 ++++ istring.h +@@ -162,19 +162,19 @@ public: + + _Myt& operator+=(const _Myt& _Right) + { // append _Right +- append(_Right); ++ this->append(_Right); + return (*this); + } + + _Myt& operator+=(const _Elem *_Ptr) + { // append [_Ptr, <null>) +- append(_Ptr); ++ this->append(_Ptr); + return (*this); + } + + _Myt& operator+=(_Elem _Ch) + { // append 1 * _Ch +- append(static_cast<size_type>(1), _Ch); ++ this->append(static_cast<size_type>(1), _Ch); + return (*this); + } + diff --git a/games/exult/patches/patch-usecode_compiler_ucstmt.cc b/games/exult/patches/patch-usecode_compiler_ucstmt.cc new file mode 100644 index 00000000000..1cdb7bd5108 --- /dev/null +++ b/games/exult/patches/patch-usecode_compiler_ucstmt.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-usecode_compiler_ucstmt.cc,v 1.1 2015/04/25 00:56:04 joerg Exp $ + +Key function must not be inline, otherwise the vtable is not created. + +--- usecode/compiler/ucstmt.cc.orig 2015-04-25 00:38:04.000000000 +0000 ++++ usecode/compiler/ucstmt.cc +@@ -808,7 +808,7 @@ void Uc_converse_statement::gen + * Delete. + */ + +-inline Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement ++Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement + ( + ) + { |