Merge lp:~abreu-alexandre/cordova-ubuntu/fix-icu-dev-version into lp:cordova-ubuntu/2.8

[Robert Bruce Park]

Rip out ICU, which was conflicting with an incompatible version of ICU pulled in by Qt itself.

[Robert Bruce Park (robru)]

dholbach and I both tested that this allows the tests to run.

review: Approve

[Robert Bruce Park (robru)]

nm, no change rebuild has same results...

review: Disapprove

Unmerged revisions

253. By Alexandre Abreu on 2014-01-29

remove icu references for now

252. By Alexandre Abreu on 2014-01-28

Fix icu dev version pulled

=== modified file 'debian/control'
--- debian/control	2013-10-16 21:11:15 +0000
+++ debian/control	2014-01-29 17:38:55 +0000
@@ -5,7 +5,6 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                libx11-dev,
-               libicu-dev,
                pkg-config,
                qtbase5-dev,
                qtchooser,

=== modified file 'src/plugins/globalization.cpp'
--- src/plugins/globalization.cpp	2013-08-30 10:50:41 +0000
+++ src/plugins/globalization.cpp	2014-01-29 17:38:55 +0000
@@ -1,7 +1,5 @@
 
 #include <ctime> //TODO: switch to QTimeZone (QT 5.1)
-#include <unicode/decimfmt.h>
-#include <unicode/timezone.h>
 
 #include "globalization.h"
 
@@ -232,25 +230,13 @@
         this->callback(ecId, QString("new GlobalizationError(%1, 'parsing error')").arg(Globalization::PARSING_ERROR));
 }
 
-static QString ustr2qstr(UnicodeString &ustr) {
-    std::string res;
-    ustr.toUTF8String(res);
-
-    return QString(res.c_str());
-}
-
 void Globalization::getNumberPattern(int scId, int ecId, int type) {
     Q_UNUSED(ecId);
-    UErrorCode status = U_ZERO_ERROR;
-    icu::DecimalFormat icu(status);
-
-    icu::UnicodeString pattern;
-    icu.toPattern(pattern);
 
     QLocale locale;
     QVariantMap obj;
 
-    obj.insert("pattern", ustr2qstr(pattern));
+    obj.insert("pattern", "#,##0.###");
 
     switch ((NumberType)type) {
     case Globalization::DECIMAL:
@@ -264,8 +250,8 @@
         break;
     };
 
-    obj.insert("fraction", icu.getMaximumFractionDigits());
-    obj.insert("rounding", icu.getRoundingIncrement());
+    obj.insert("fraction", 0);
+    obj.insert("rounding", 0);
     obj.insert("positive", QString(locale.positiveSign()));
     obj.insert("negative", QString(locale.negativeSign()));
     obj.insert("decimal", QString(locale.decimalPoint()));
@@ -303,13 +289,9 @@
         break;
     };
 
-    UnicodeString result;
-    QSharedPointer<TimeZone> timezone = QSharedPointer<TimeZone>(TimeZone::createDefault());
-    timezone->getDisplayName(inDayLightSavingsTime(), TimeZone::SHORT, result);
-
-    res.insert("timezone", ustr2qstr(result));
-    res.insert("utc_offset", timezone->getRawOffset() / 1000 + timezone->getDSTSavings() / 1000);
-    res.insert("dst_offset", timezone->getDSTSavings() / 1000);
+    res.insert("timezone", "");
+    res.insert("utc_offset", 0);
+    res.insert("dst_offset", 0);
 
     this->cb(scId, res);
 }