[pkgsrc/trunk]: pkgsrc/wm/fluxbox Finally apply patch originally provided in ...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e9004fccb74
branches:  trunk
changeset: 459989:3e9004fccb74
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Thu Aug 14 14:17:39 2003 +0000

description:
Finally apply patch originally provided in PR pkg/20009 and re-submitted
in PR pkg/22476 by Dandy Sakano.  This patch corrects the erraneous usage
of the return value of setlocale(3).  This bug has been submitted to the
fluxbox bugbox, but apparently has not yet been dealt with.

diffstat:

 wm/fluxbox/distinfo         |   3 ++-
 wm/fluxbox/patches/patch-ae |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 36577db1b5e1 -r 3e9004fccb74 wm/fluxbox/distinfo
--- a/wm/fluxbox/distinfo       Thu Aug 14 12:20:01 2003 +0000
+++ b/wm/fluxbox/distinfo       Thu Aug 14 14:17:39 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/07/28 17:50:11 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2003/08/14 14:17:39 jschauma Exp $
 
 SHA1 (fluxbox-0.9.4.tar.bz2) = b0b5c9f8befc6e2014fed61bb09262ecae0b8b58
 Size (fluxbox-0.9.4.tar.bz2) = 442182 bytes
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = 296fe52f6215612ed94a0c9279ac804e42efb06c
 SHA1 (patch-ac) = fcbf8b9978b145680a27a6e4796d8a5738a9c035
 SHA1 (patch-ad) = 9fe4a9fe549afc3f402b0b11050c69f3c9621118
+SHA1 (patch-ae) = f6424828354d6118ee350ae4739a6ebeb0db5bdb
diff -r 36577db1b5e1 -r 3e9004fccb74 wm/fluxbox/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-ae       Thu Aug 14 14:17:39 2003 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2003/08/14 14:17:41 jschauma Exp $
+
+--- src/I18n.cc.orig   2003-08-14 10:03:53.000000000 -0400
++++ src/I18n.cc        2003-08-14 10:05:06.000000000 -0400
+@@ -58,7 +58,9 @@
+ I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
+ #ifdef        HAVE_SETLOCALE
+     //make sure we don't get 0 to m_locale string
+-    char *temp = setlocale(LC_ALL, "");
++    char *temp;
++    (void)setlocale(LC_ALL, "");
++    temp = setlocale(LC_MESSAGES, NULL);
+     m_locale = ( temp ?  temp : ""); 
+     if (m_locale.size() == 0) {
+         cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;