diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2003-12-20 05:29:55 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2003-12-20 05:29:55 +0000 |
commit | 8c57a9cd20295bdfd3827cf3aa92d5708a7f1a0c (patch) | |
tree | bb725c944411f5079e16cc99f03230a197d5f7ec /wm | |
parent | 470255493f672b969a3308759c3bf2d585930fa2 (diff) | |
download | pkgsrc-8c57a9cd20295bdfd3827cf3aa92d5708a7f1a0c.tar.gz |
Fix build on NetBSD 1.6 which does not have wctype_t type.
Patch provided and tested by Soren Jacobsen. This also closes PR
pkg/23799.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/enlightenment/distinfo | 3 | ||||
-rw-r--r-- | wm/enlightenment/patches/patch-aa | 58 |
2 files changed, 60 insertions, 1 deletions
diff --git a/wm/enlightenment/distinfo b/wm/enlightenment/distinfo index a6c2bf4eb07..45eedaf084d 100644 --- a/wm/enlightenment/distinfo +++ b/wm/enlightenment/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.5 2003/12/18 05:31:34 xtraeme Exp $ +$NetBSD: distinfo,v 1.6 2003/12/20 05:29:55 xtraeme Exp $ SHA1 (enlightenment-0.16.6.tar.gz) = 971cbed022b5162c1f7034758c91549fa1a9227f Size (enlightenment-0.16.6.tar.gz) = 11924484 bytes +SHA1 (patch-aa) = c64318bba6fbdfb616a32a5952207599ce46ffa0 diff --git a/wm/enlightenment/patches/patch-aa b/wm/enlightenment/patches/patch-aa new file mode 100644 index 00000000000..82d881de81b --- /dev/null +++ b/wm/enlightenment/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.4 2003/12/20 05:29:55 xtraeme Exp $ + +--- dox/file.c.orig Wed Nov 5 08:42:17 2003 ++++ dox/file.c Fri Dec 19 20:56:04 2003 +@@ -26,6 +26,11 @@ + # include <wctype.h> + #endif + ++#include <sys/param.h> ++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106210000) ++typedef unsigned int wctype_t; ++#endif ++ + #ifdef __EMX__ + #define chdir _chdir2 + #define getcwd _getcwd2 +@@ -618,7 +623,7 @@ + int cnt, i; + char *start, *finish, *ss, *w; + +- int wcflg, mbflg; ++ int mbflg; + struct char_class { + char *name; + wctype_t wt; +@@ -654,6 +659,7 @@ + } + + /* Check multibyte character class is available or not */ ++/* + wcflg = 0; + for ( cc = char_class_tbl; cc->name != NULL; cc++ ) + { +@@ -661,7 +667,7 @@ + if ( cc->wt != (wctype_t)0 ) + wcflg = 1; + } +- ++*/ + cnt = 0; + i = 0; + start = NULL; +@@ -679,6 +685,7 @@ + if ( len < 0 ) { i++; continue; } + + /* Check multibyte character class */ ++/* + if ( wcflg ) + { + wchar_t wc; +@@ -700,6 +707,7 @@ + } + } + else ++*/ + mbflg = len; + + if ((cnt == num) && ( |