- remove support for locale.alias from qlocale (only in qtextcodec, sorry)

  unfortunately moc is required for qtextsstream but qlocale is required for moc so we cannot
  use qtextstream in qlocale and any other way is highly inefficent,

Changed files:
    qt4-locale.patch -> 1.3

diff --git a/qt4-locale.patch b/qt4-locale.patch
index c03945986fbb11c69f0bbaf1d73af68bb95cb1dd..2cba9cc08228db35dd9ab6d1dfd1d89cb8443304 100644 (file)
--- a/qt4-locale.patch
+++ b/qt4-locale.patch
@@ -1,40 +1,3 @@
---- qt-x11-preview-4.0.0-tp1/src/core/tools/qlocale.cpp.orig   2004-07-08 11:14:43.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/src/core/tools/qlocale.cpp        2004-07-14 13:26:46.680776232 +0200
-@@ -1629,8 +1629,32 @@
- const char* QLocalePrivate::systemLocaleName()
- {
-     static QByteArray lang;
--    lang = getenv("LANG");
--
-+    lang = getenv( "LC_ALL" );
-+    if ( lang.isEmpty() )
-+    {
-+          lang = getenv( "LC_MESSAGES" );
-+    }
-+    if ( lang.isEmpty() )
-+    {
-+          lang = getenv( "LANG" );
-+    }
-+    
-+    QFile * plik = new QFile("/usr/share/locale/locale.alias");
-+        if (plik->open(QIODevice::ReadOnly))
-+        {
-+                QTextStream stream(plik);
-+                QString line;
-+                int i = 1;
-+                while (!stream.atEnd()) {
-+                        line = stream.readLine();
-+                        if (!line.startsWith("#") && ( line.left(line.indexOf(QChar('t'))) == lang.toLower() ) )
-+                        {
-+                                     lang = (line.mid(line.lastIndexOf(QChar('t')))).ascii();
-+                        }
-+                }
-+                plik->close();
-+        }
-+      if (plik) delete plik;
- #if !defined(QWS) && defined(Q_OS_MAC)
-     if (!lang.isEmpty())
-         return lang;
 --- qt-x11-preview-4.0.0-tp1/src/core/codecs/qtextcodec.cpp.orig       2004-07-08 11:14:42.000000000 +0200
 +++ qt-x11-preview-4.0.0-tp1/src/core/codecs/qtextcodec.cpp    2004-07-14 13:30:02.957937568 +0200
 @@ -2630,14 +2630,35 @@
@@ -306,3 +269,4 @@
      a.installTranslator( &qtTranslator );
  
      Config *conf = Config::loadConfig( profileName );
+