From e9e60fea070850278e1e86c75aed1850a585601d Mon Sep 17 00:00:00 2001
From: Damien Dupuis <alliance-users@asim.lip6.fr>
Date: Thu, 25 Feb 2010 15:31:45 +0000
Subject: [PATCH]     Correct an Utf8 bug.

    When using easyChams you need to set LANG to utf8
---
 bootstrap/easyChams/CompilationWidget.cpp | 4 ++--
 bootstrap/easyChams/script/chams.sh       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bootstrap/easyChams/CompilationWidget.cpp b/bootstrap/easyChams/CompilationWidget.cpp
index 75645d47..d48e9a1b 100644
--- a/bootstrap/easyChams/CompilationWidget.cpp
+++ b/bootstrap/easyChams/CompilationWidget.cpp
@@ -229,14 +229,14 @@ void CompilationWidget::updateConfig(QStringList list) {
 
 void CompilationWidget::updateError() {
     QByteArray data = _myProcess->readAllStandardError();
-    _console->insertPlainText(QString(data));
+    _console->insertPlainText(QString::fromUtf8(data.constData()));
     int end = _console->verticalScrollBar()->maximum();
     _console->verticalScrollBar()->setValue(end);
 }
 
 void CompilationWidget::updateText() {
     QByteArray data = _myProcess->readAllStandardOutput();
-    QString str(data);
+    QString str = QString::fromUtf8(data.constData());
     QRegExp rx = QRegExp ( "([0-9]+)%" );
     if ( str.contains(rx) ) {
         bool ok;
diff --git a/bootstrap/easyChams/script/chams.sh b/bootstrap/easyChams/script/chams.sh
index b9fee15d..9fff19e8 100755
--- a/bootstrap/easyChams/script/chams.sh
+++ b/bootstrap/easyChams/script/chams.sh
@@ -81,7 +81,8 @@ compile() {
         echo " -> Please update manually"
         exit 1
       fi
-      svn update --accept postpone # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant)
+      #svn update --accept postpone # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant)
+      svn update # par defaut on prendra la decision en cas de conflits plus tard (au cas ou le status n'est pas suffisant)
     fi
     if [ ! -d "$BUILD/$TOOL" ]
     then
@@ -102,7 +103,7 @@ compile() {
     echo "#### Now compiling $TOOL ####"
     echo ""
     cmake -D "CMAKE_BUILD_TYPE:STRING=$MODE" -D "BUILD_DOC:STRING=$DOC" -D "BUILD_SHARED_LIBS:STRING=$SHARED" $SOURCE/$TOOL
-    make "DESTDIR=$INSTALL" -j2 install
+    make "DESTDIR=$INSTALL" -j8 install
     if [ $? -ne 0 ]
     then
       exit 1