From 377a7a4c40ebec0cbb404189dff745c6ec5dbc29 Mon Sep 17 00:00:00 2001 From: rillig Date: Tue, 31 May 2005 14:05:57 +0000 Subject: Added two patches needed for Solaris with Sun C++ 5.6. Also, the Solaris /usr/ucb/install cannot handle multiple directories. --- wm/icewm/Makefile.common | 5 +++-- wm/icewm/distinfo | 6 ++++-- wm/icewm/patches/patch-af | 10 +++++----- wm/icewm/patches/patch-ag | 24 ++++++++++++++++++++++++ wm/icewm/patches/patch-ah | 23 +++++++++++++++++++++++ 5 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 wm/icewm/patches/patch-ag create mode 100644 wm/icewm/patches/patch-ah (limited to 'wm') diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 1d394c0caa6..6639ec13ac1 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.44 2005/05/31 14:05:57 rillig Exp $ DISTNAME= icewm-1.2.20 CATEGORIES= x11 wm @@ -54,7 +54,8 @@ post-extract: @${CP} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA_DIR} ${HTMLDIR} for file in BUGS CHANGES COPYING README README.wm-session TODO; do\ ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \ done diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index 78abe3b57e8..c88a536685f 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.23 2005/02/23 18:43:54 wiz Exp $ +$NetBSD: distinfo,v 1.24 2005/05/31 14:05:57 rillig Exp $ SHA1 (icewm-1.2.20.tar.gz) = 35ec8499d2f550d20b539d1af040decc1f43306d RMD160 (icewm-1.2.20.tar.gz) = d24fd9f68c04284c4a6bc50f398fc2ab348408d9 Size (icewm-1.2.20.tar.gz) = 948530 bytes SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424 -SHA1 (patch-af) = c2a2a4e87ffc2c03959ca32a185b997db5a02616 +SHA1 (patch-af) = dbba18656c0f49a17ee2744d43c84b6a43bdd7a6 +SHA1 (patch-ag) = 101306de4d144a8ad470c39f80ecac9103264cf5 +SHA1 (patch-ah) = 5e0fd7643010132917c1fbc92cd22b4cc1d925d0 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 -@@ -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(&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(&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 + 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(0) : 0); ++ return (Success == fCount ? fCount.long_data(0) : 0); + } + + int WorkspaceInfo::parseWorkspaceName(char const * name) { -- cgit v1.2.3