Added two patches needed for Solaris with Sun C++ 5.6. Also, the Solaris

/usr/ucb/install cannot handle multiple directories.

3 files changed, 52 insertions, 5 deletions

diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
index f1c0ce49311..9acdcf830cb 100644
--- a/wm/icewm/patches/patch-af
+++ b/wm/icewm/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.12 2005/01/20 04:27:49 xtraeme Exp $
+$NetBSD: patch-af,v 1.13 2005/05/31 14:05:57 rillig Exp $
 
---- src/ylocale.cc.orig	2005-01-20 05:16:50.000000000 +0100
-+++ src/ylocale.cc	2005-01-20 05:18:15.000000000 +0100
+--- src/ylocale.cc.orig	Sun Jan  9 22:48:23 2005
++++ src/ylocale.cc	Tue May 31 13:11:58 2005
 @@ -15,6 +15,7 @@
  
  #include "intl.h"
@@ -10,11 +10,11 @@ $NetBSD: patch-af,v 1.12 2005/01/20 04:27:49 xtraeme Exp $
  
  #ifdef CONFIG_I18N
  #include <errno.h>
-@@ -152,7 +153,11 @@
+@@ -152,7 +153,11 @@ YUChar *YLocale::unicodeString(const YLC
      char * inbuf((char *) lStr), * outbuf((char *) uStr);
      size_t inlen(lLen), outlen(4 * lLen);
  
-+#if __NetBSD_Version__ >= 200000000
++#if (__NetBSD_Version__ >= 200000000) || defined(__sun)
 +    if (0 > (int) iconv(instance->toUnicode, (const char **)&inbuf, &inlen, &outbuf, &outlen))
 +#else
      if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
diff --git a/wm/icewm/patches/patch-ag b/wm/icewm/patches/patch-ag
new file mode 100644
index 00000000000..a975538577a
--- /dev/null
+++ b/wm/icewm/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.8 2005/05/31 14:05:57 rillig Exp $
+
+Needed for Sun C++ 5.6 on Solaris.
+
+--- src/wmclient.cc.orig	Tue May 31 13:07:11 2005
++++ src/wmclient.cc	Tue May 31 13:07:29 2005
+@@ -599,7 +599,7 @@ void YFrameClient::setWindowTitle(const 
+         int count;
+         char ** strings(NULL);
+ 
+-        if (XmbTextPropertyToTextList(xapp->display(), &title,
++        if (XmbTextPropertyToTextList(xapp->display(), const_cast<XTextProperty *>(&title),
+                                       &strings, &count) >= 0 &&
+             count > 0 && strings[0])
+             setWindowTitle((const char *)strings[0]);
+@@ -617,7 +617,7 @@ void YFrameClient::setIconTitle(const XT
+         int count;
+         char ** strings(NULL);
+ 
+-        if (XmbTextPropertyToTextList(xapp->display(), &title,
++        if (XmbTextPropertyToTextList(xapp->display(), const_cast<XTextProperty *>(&title),
+                                       &strings, &count) >= 0 &&
+             count > 0 && strings[0])
+             setIconTitle((const char *)strings[0]);
diff --git a/wm/icewm/patches/patch-ah b/wm/icewm/patches/patch-ah
new file mode 100644
index 00000000000..721ff81e8d7
--- /dev/null
+++ b/wm/icewm/patches/patch-ah
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.4 2005/05/31 14:05:57 rillig Exp $
+
+Needed for Sun C++ 5.6 without patch 117549-02.
+
+--- src/icesh.cc.orig	Sun Jan  9 22:48:23 2005
++++ src/icesh.cc	Tue May 31 13:56:02 2005
+@@ -91,6 +91,7 @@ public:
+ 
+     template <class T>
+     T data(unsigned index) const { return ((T *) fData)[index]; }
++    long long_data(unsigned index) const { return ((long *) fData)[index]; }
+ 
+     operator int() const { return fStatus; }
+ 
+@@ -385,7 +386,7 @@ struct WorkspaceInfo {
+ };
+ 
+ unsigned WorkspaceInfo::count() {
+-    return (Success == fCount ? fCount.data<long>(0) : 0);
++    return (Success == fCount ? fCount.long_data(0) : 0);
+ }
+ 
+ int WorkspaceInfo::parseWorkspaceName(char const * name) {