[csw-devel] SF.net SVN: gar:[4224] csw/mgar/pkg/mcabber/trunk

[skayser at users.sourceforge.net]

Revision: 4224
          http://gar.svn.sourceforge.net/gar/?rev=4224&view=rev
Author:   skayser
Date:     2009-04-08 00:34:16 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
mcabber: fixed build issues on Solaris 10

Modified Paths:
--------------
    csw/mgar/pkg/mcabber/trunk/checksums
    csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff

Modified: csw/mgar/pkg/mcabber/trunk/checksums
===================================================================
--- csw/mgar/pkg/mcabber/trunk/checksums	2009-04-08 00:21:29 UTC (rev 4223)
+++ csw/mgar/pkg/mcabber/trunk/checksums	2009-04-08 00:34:16 UTC (rev 4224)
@@ -1,3 +1,3 @@
 189fb9d23f5a8412bc660884528475ea  download/mcabber-0.9.9.tar.bz2
 a7ceb9f017c2c9267e2264aa626b7a4e  download/patch-inline.diff
-cff6d32fef59fc10806534025dc53f7e  download/patch-iswblank.diff
+73e2ae212a072d753942ff24c806ba5d  download/patch-iswblank.diff

Modified: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff
===================================================================
--- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff	2009-04-08 00:21:29 UTC (rev 4223)
+++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff	2009-04-08 00:34:16 UTC (rev 4224)
@@ -1,13 +1,22 @@
---- mcabber-0.9.9.orig/src/screen.h	2008-10-09 22:17:52.000000000 +0200
-+++ mcabber-0.9.9/src/screen.h	2009-03-08 16:31:44.043214331 +0100
-@@ -20,6 +20,10 @@
- //static void spellcheck(char*, char*);
- #endif
+diff --speed-large-files --minimal -Nru mcabber-0.9.9.orig/src/utf8.h mcabber-0.9.9/src/utf8.h
+--- mcabber-0.9.9.orig/src/utf8.h	2008-10-09 22:17:52.000000000 +0200
++++ mcabber-0.9.9/src/utf8.h	2009-04-03 17:57:44.524993893 +0200
+@@ -17,6 +17,18 @@
  
-+#ifndef HAVE_ISWBLANK
-+#define iswblank(wc) iswctype(wc, wctype("blank"))
-+#endif
+ #ifdef HAVE_WCTYPE_H
+ # include <wctype.h>
 +
- #include "hbuf.h"
- #include "logprint.h"
- 
++/* The following bit is a hack for Solaris 8&9 systems that don't have
++ * iswblank(). HAVE_ISWBLANK is not set by the mcabber build system so
++ * this always gets included, even on Solaris 10 systems where iswblank()
++ * is present.
++ * For now i made sure it comes after wctype.h so it doesn't create
++ * problems (wctype.h has calls to iswblank() before wctype() is declared).
++ */
++# ifndef HAVE_ISWBLANK
++# define iswblank(wc) iswctype(wc, wctype("blank"))
++# endif
++
+ #else
+ # define iswblank(c) (c == ' ')
+ # define iswalnum(c) isalnum(c)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.