ALT Linux repos
S: | 4.8.7-alt25 |
5.0: | 4.5.2-alt1.M50.1 |
4.1: | 4.4.3-alt1.M41.1 |
4.0: | 4.3.4-alt5.M40.1 |
3.0: | 4.0.1-alt1 |
+updates: | 4.0.1-alt2 |
+backports: | 4.2.3-alt7.1.M30 |
Group :: System/Libraries
RPM: qt4
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: qt-4.8.5-alt-honor-SUSv3-locales.patch
Download
Download
--- qt-x11-opensource-src-4.8.0/src/corelib/codecs/qtextcodec.cpp~ 2012-01-13 19:08:19.000000000 +0400
+++ qt-x11-opensource-src-4.8.0/src/corelib/codecs/qtextcodec.cpp 2012-01-13 19:16:34.000000000 +0400
@@ -631,10 +631,13 @@ static void setupLocaleMapper()
// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
// environment variables.
QByteArray lang = qgetenv("LC_ALL");
- if (lang.isEmpty() || lang == "C") {
+ if (lang.isEmpty()) {
+ lang = qgetenv("LC_MESSAGES");
+ }
+ if (lang.isEmpty()) {
lang = qgetenv("LC_CTYPE");
}
- if (lang.isEmpty() || lang == "C") {
+ if (lang.isEmpty()) {
lang = qgetenv("LANG");
}
--- qt-x11-opensource-src-4.8.0/src/corelib/codecs/qiconvcodec.cpp~ 2012-01-13 19:08:19.000000000 +0400
+++ qt-x11-opensource-src-4.8.0/src/corelib/codecs/qiconvcodec.cpp 2012-01-13 19:18:53.000000000 +0400
@@ -495,11 +495,15 @@ iconv_t QIconvCodec::createIconv_t(const
// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
// environment variables.
char * lang = qstrdup(qgetenv("LC_ALL").constData());
- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+ if (!lang || lang[0] == 0) {
+ if (lang) delete [] lang;
+ lang = qstrdup(qgetenv("LC_MESSAGES").constData());
+ }
+ if (!lang || lang[0] == 0) {
if (lang) delete [] lang;
lang = qstrdup(qgetenv("LC_CTYPE").constData());
}
- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
+ if (!lang || lang[0] == 0) {
if (lang) delete [] lang;
lang = qstrdup(qgetenv("LANG").constData());
}