[pkgsrc/trunk]: pkgsrc/emulators/palmosemulator Fix some, but not all issues ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d7291673913
branches:  trunk
changeset: 511977:8d7291673913
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 28 13:52:05 2006 +0000

description:
Fix some, but not all issues with GCC 3.4.

diffstat:

 emulators/palmosemulator/distinfo         |   4 +-
 emulators/palmosemulator/patches/patch-ao |  58 +++++++++++++++++++++++++++++++
 emulators/palmosemulator/patches/patch-ap |  22 +++++++++++
 3 files changed, 83 insertions(+), 1 deletions(-)

diffs (103 lines):

diff -r b98e74ac636b -r 8d7291673913 emulators/palmosemulator/distinfo
--- a/emulators/palmosemulator/distinfo Fri Apr 28 13:49:15 2006 +0000
+++ b/emulators/palmosemulator/distinfo Fri Apr 28 13:52:05 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/04/28 13:52:05 joerg Exp $
 
 SHA1 (palmosemulator/emulator_src_3.5.tar.gz) = 2debd7690736397d0af41f7b2d482df65391fc65
 RMD160 (palmosemulator/emulator_src_3.5.tar.gz) = fbb6761e4c43ecc9fb20d90d2ae0ec6ccf1c3f27
@@ -20,3 +20,5 @@
 SHA1 (patch-al) = 50342df4bb9d020f0b72be608d0656351dae4463
 SHA1 (patch-am) = 2790c8b567a94d86bced52d59cf62b4448b62731
 SHA1 (patch-an) = 93e326e3ab9f532d5bab1cc987c179e8337a823d
+SHA1 (patch-ao) = 9ace708f71d33802059db53c9242f0d89a77e4da
+SHA1 (patch-ap) = 7cb159b84f8ad0638c49285ea5140aae93623f96
diff -r b98e74ac636b -r 8d7291673913 emulators/palmosemulator/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-ao Fri Apr 28 13:52:05 2006 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ao,v 1.1 2006/04/28 13:52:06 joerg Exp $
+
+--- SrcShared/EmStream.h.orig  2006-04-28 12:41:47.000000000 +0000
++++ SrcShared/EmStream.h
+@@ -90,7 +90,7 @@ class EmStream
+ 
+                                                                       container.resize (numElements);
+ 
+-                                                                      deque<T>::iterator      iter = container.begin ();
++                                                                      typename deque<T>::iterator     iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this >> *iter;
+@@ -108,7 +108,7 @@ class EmStream
+ 
+                                                                       container.resize (numElements);
+ 
+-                                                                      list<T>::iterator       iter = container.begin ();
++                                                                      typename list<T>::iterator      iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this >> *iter;
+@@ -126,7 +126,7 @@ class EmStream
+ 
+                                                                       container.resize (numElements);
+ 
+-                                                                      vector<T>::iterator     iter = container.begin ();
++                                                                      typename vector<T>::iterator    iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this >> *iter;
+@@ -143,7 +143,7 @@ class EmStream
+ 
+                                                                       *this << numElements;
+ 
+-                                                                      deque<T>::const_iterator        iter = container.begin ();
++                                                                      typename deque<T>::const_iterator       iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this << *iter;
+@@ -160,7 +160,7 @@ class EmStream
+ 
+                                                                       *this << numElements;
+ 
+-                                                                      list<T>::const_iterator iter = container.begin ();
++                                                                      typename list<T>::const_iterator        iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this << *iter;
+@@ -177,7 +177,7 @@ class EmStream
+ 
+                                                                       *this << numElements;
+ 
+-                                                                      vector<T>::const_iterator       iter = container.begin ();
++                                                                      typename vector<T>::const_iterator      iter = container.begin ();
+                                                                       while (iter != container.end ())
+                                                                       {
+                                                                               *this << *iter;
diff -r b98e74ac636b -r 8d7291673913 emulators/palmosemulator/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-ap Fri Apr 28 13:52:05 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2006/04/28 13:52:06 joerg Exp $
+
+--- SrcShared/Miscellaneous.cpp.orig   2006-04-28 13:19:44.000000000 +0000
++++ SrcShared/Miscellaneous.cpp
+@@ -2687,7 +2687,7 @@ void FormatInteger (char* dest, uint32 i
+       // Get the thousands separator character(s).
+ 
+       struct lconv*   locale_data = localeconv ();
+-      char*                   thousands_sep = locale_data->thousands_sep;
++      const char*     thousands_sep = locale_data->thousands_sep;
+ 
+       if (strlen (thousands_sep) == 0)
+       {
+@@ -2747,7 +2747,7 @@ string FormatInteger (uint32 integer)
+       // Get the thousands separator character(s).
+ 
+       struct lconv*   locale_data = localeconv ();
+-      char*                   thousands_sep = locale_data->thousands_sep;
++      const char*     thousands_sep = locale_data->thousands_sep;
+ 
+       if (strlen (thousands_sep) == 0)
+       {