diff options
| author | ghen <ghen> | 2008-01-07 09:54:25 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2008-01-07 09:54:25 +0000 |
| commit | 2f0a701948f3127dd1b5f05a9b868a01c19099d5 (patch) | |
| tree | 4c883f85fe0ef12c7717f3c3507cc85f26c334c1 /wm | |
| parent | c2f462bff8725a7e51a9beba42fa111ad9bbdbbf (diff) | |
| download | pkgsrc-2f0a701948f3127dd1b5f05a9b868a01c19099d5.tar.gz | |
Use nl_langinfo(3) instead of the unportable "" to specify the default
character set for iconv_open(3). This fixes keybindings that didn't work
in wmii-3.6. From wmii's mercurial repo via Peter Bex. Bump PKGREVISION.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/wmii/Makefile | 3 | ||||
| -rw-r--r-- | wm/wmii/distinfo | 3 | ||||
| -rw-r--r-- | wm/wmii/patches/patch-ac | 28 |
3 files changed, 32 insertions, 2 deletions
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile index 42e349c9b40..20946c85564 100644 --- a/wm/wmii/Makefile +++ b/wm/wmii/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2008/01/06 21:55:38 ghen Exp $ +# $NetBSD: Makefile,v 1.16 2008/01/07 09:54:25 ghen Exp $ DISTNAME= wmii-3.6 +PKGREVISION= 1 CATEGORIES= wm MASTER_SITES= http://www.suckless.org/download/ diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo index 1d6d134deec..a1cb31f3f82 100644 --- a/wm/wmii/distinfo +++ b/wm/wmii/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2008/01/06 21:55:38 ghen Exp $ +$NetBSD: distinfo,v 1.7 2008/01/07 09:54:26 ghen Exp $ SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3 RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52 Size (wmii-3.6.tar.gz) = 208249 bytes SHA1 (patch-aa) = 71d5bb9d546e0cc562f463c03af458464fd4e782 SHA1 (patch-ab) = 64d8f1b79d2ebf307c3189d0e5bcfc53957e3fcf +SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31 diff --git a/wm/wmii/patches/patch-ac b/wm/wmii/patches/patch-ac new file mode 100644 index 00000000000..c4e0e24a701 --- /dev/null +++ b/wm/wmii/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.1 2008/01/07 09:54:26 ghen Exp $ + +http://www.suckless.org/hg.rc/wmii/rev/3749896cf02c + +--- cmd/wmii/utf.c.orig 2007-11-16 14:59:15.000000000 +0100 ++++ cmd/wmii/utf.c +@@ -2,6 +2,7 @@ + #include "dat.h" + #include <errno.h> + #include <iconv.h> ++#include <langinfo.h> + #include <string.h> + #include "fns.h" + +@@ -11,8 +12,11 @@ toutf8n(char *str, size_t nstr) { + char *buf, *pos; + size_t nbuf, bsize; + +- if(cd == nil) +- cd = iconv_open("UTF-8", ""); ++ if(cd == nil) { ++ cd = iconv_open("UTF-8", nl_langinfo(CODESET)); ++ if(cd == (iconv_t)-1) ++ fatal("Can't convert from native codeset to UTF-8"); ++ } + iconv(cd, nil, nil, nil, nil); + + bsize = nstr * 1.25 + 4; |