Really fix locale stuff this time. Honest...

4 files changed, 51 insertions, 13 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index b6884ba147bb..2d611ee6d5fd 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.123 2004/10/04 21:35:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.124 2004/10/07 18:19:42 ciaranm Exp $
+
+  07 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch,
+  fluxbox-0.9.10-r4.ebuild:
+  Really fix locale stuff this time. Honest...
 
 *fluxbox-0.9.10-r4 (04 Oct 2004)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 48262c4ff4d0..224919b29a17 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6266d9ec84f9b20d2735085225734d45 ChangeLog 24347
 MD5 061609a2a096a72c443d7ef5d0aa7972 fluxbox-0.9.10-r2.ebuild 2011
 MD5 a6ccc60a2244f7fbd8d33671f3bbf1a9 fluxbox-0.9.9.ebuild 1708
-MD5 8d4f4b36edc864e2631b9efab75ad89d fluxbox-0.9.10-r4.ebuild 5031
+MD5 e42802d242f3d0884b405fc236e5bb6a fluxbox-0.9.10-r4.ebuild 5140
 MD5 b2bac3fd73b8f4215029b843fad6f06a fluxbox-0.9.10-r1.ebuild 1835
 MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
@@ -33,10 +30,4 @@ MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
 MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
 MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
 MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBYcFPLLFUmVNQ7rkRAvEVAKCXmNnYU6EH3HZk/1svUd0I5H8TBQCfWcX+
-nxIoGxKoFGfwNYeFnoHBe/g=
-=/Fpt
------END PGP SIGNATURE-----
+MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch
new file mode 100644
index 000000000000..b087eedb6d8a
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch
@@ -0,0 +1,39 @@
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.work/src/FbTk/XmbFontImp.cc
+--- fluxbox.real/src/FbTk/XmbFontImp.cc	2004-09-12 11:48:46.000000000 +1000
++++ fluxbox.work/src/FbTk/XmbFontImp.cc	2004-10-02 15:45:32.000000000 +1000
+@@ -117,7 +117,7 @@
+     char **missing, *def = "-";
+     int nmissing, pixel_size = 0, buf_size = 0;
+     char weight[FONT_ELEMENT_SIZE], slant[FONT_ELEMENT_SIZE];
+-    char * orig_locale = "";
++    std::string orig_locale = "";
+ 
+ #ifdef HAVE_SETLOCALE
+     if (utf8mode) {
+@@ -131,7 +131,7 @@
+     if (fs && (! nmissing)) {
+ #ifdef HAVE_SETLOCALE
+         if (utf8mode)
+-            setlocale(LC_CTYPE, orig_locale);
++            setlocale(LC_CTYPE, orig_locale.c_str());
+ #endif // HAVE_SETLOCALE
+         return fs;
+     }
+@@ -143,7 +143,7 @@
+         setlocale(LC_CTYPE, "C");
+         fs = XCreateFontSet(display, fontname,
+                             &missing, &nmissing, &def);
+-        setlocale(LC_CTYPE, orig_locale);
++        setlocale(LC_CTYPE, orig_locale.c_str());
+     }
+ #endif // HAVE_SETLOCALE
+ 
+@@ -189,7 +189,7 @@
+ 
+ #ifdef HAVE_SETLOCALE
+     if (utf8mode)
+-        setlocale(LC_CTYPE, orig_locale);
++        setlocale(LC_CTYPE, orig_locale.c_str());
+ #endif // HAVE_SETLOCALE
+ 
+     return fs;
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
index e0d386fa7f4f..fa0331464476 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild,v 1.1 2004/10/04 21:35:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r4.ebuild,v 1.2 2004/10/07 18:19:42 ciaranm Exp $
 
 inherit eutils
 
@@ -35,6 +35,9 @@ src_unpack() {
 	# Branch update from upstream CVS
 	epatch ${WORKDIR}/${PN}-${PV}-biiiiig-update.patch
 
+	# Fix locales, see discussion in bug 65803.
+	epatch ${FILESDIR}/${PV}/${PN}-${PV}-eat-this-setlocale.patch
+
 	# Some fluxbox-generate_menu things. These are ciaranm's fault...
 	epatch ${FILESDIR}/${PV}/${PN}-${PV}-posix-on-toast.patch
 	epatch ${FILESDIR}/${PV}/${PN}-${PV}-my-term-is-better-than-your-term.patch