SOURCES: qt-locale-charmap.patch - up from AC-branch to HEAD

[arekm]

Author: arekm                        Date: Mon Apr  3 18:35:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up from AC-branch to HEAD

---- Files affected:
SOURCES:
   qt-locale-charmap.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/qt-locale-charmap.patch
diff -u SOURCES/qt-locale-charmap.patch:1.1 SOURCES/qt-locale-charmap.patch:1.2
--- SOURCES/qt-locale-charmap.patch:1.1	Tue Sep 14 15:59:14 2004
+++ SOURCES/qt-locale-charmap.patch	Mon Apr  3 20:35:18 2006
@@ -1,12 +1,12 @@
---- qt-x11-free-3.3.3/src/codecs/qtextcodec.cpp.orig	2004-09-14 11:56:04.232606504 +0200
-+++ qt-x11-free-3.3.3/src/codecs/qtextcodec.cpp	2004-09-14 11:57:08.596821656 +0200
-@@ -2696,7 +2696,9 @@
+--- qt-x11-free-3.3.6/src/codecs/qtextcodec.cpp~	2006-03-26 20:01:29.000000000 +0200
++++ qt-x11-free-3.3.6/src/codecs/qtextcodec.cpp	2006-03-26 20:00:42.000000000 +0200
+@@ -2784,7 +2784,9 @@
  #else
  
- #if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+ #if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) && !defined(Q_OS_MAC)
 +    char *oldLocale = setlocale(LC_CTYPE, "");
      char *charset = nl_langinfo (CODESET);
 +    setlocale(LC_CTYPE, oldLocale);
      if ( charset )
-       localeMapper = QTextCodec::codecForName( charset );
+         localeMapper = QTextCodec::codecForName( charset );
  #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qt-locale-charmap.patch?r1=1.1&r2=1.2&f=u