Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
  - Support RFC 2822 format (LP: #1298978)

[Timo Jyrinki (timo-jyrinki)]

Built fine at https://launchpad.net/~ci-train-ppa-service/+archive/landing-008/+sourcepub/4062429/+listing-archive-extra

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/12/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-03 05:54:03 +0000
+++ debian/changelog	2014-04-03 08:41:20 +0000
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu13) trusty; urgency=medium
+
+  * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
+    - Support RFC 2822 format (LP: #1298978)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 03 Apr 2014 05:55:24 +0000
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu12) trusty; urgency=medium
 
   * 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch: Call
 
=== added file 'debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch'
--- debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch	2014-04-03 08:41:20 +0000
@@ -0,0 +1,31 @@
+From 771cf807de52c8b4352eed341c3cc40c35c9b9d2 Mon Sep 17 00:00:00 2001
+From: Timo Jyrinki <[e-mail]>
+Date: Thu, 3 Apr 2014 05:28:38 +0000
+Subject: [PATCH] Support RFC2822Date date format similar to V8.
+
+Currently a date like "Wed, 18 Sep 2013 07:00:51 -0700" cannot be parsed.
+However, this used to work in Qt 5.0.2. This commit adds a check for
+Qt::RFC2822Date format after the ISODate check but before the manually
+defined QStringLiteral formats.
+
+Task-Number: QTBUG-38011
+---
+ src/qml/jsruntime/qv4dateobject.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
+index fc94862..70bec14 100644
+--- a/src/qml/jsruntime/qv4dateobject.cpp
++++ b/src/qml/jsruntime/qv4dateobject.cpp
+@@ -488,6 +488,8 @@ static inline double ParseString(const QString &s)
+     QDateTime dt = QDateTime::fromString(s, Qt::TextDate);
+     if (!dt.isValid())
+         dt = QDateTime::fromString(s, Qt::ISODate);
++    if (!dt.isValid())
++        dt = QDateTime::fromString(s, Qt::RFC2822Date);
+     if (!dt.isValid()) {
+         QStringList formats;
+         formats << QStringLiteral("M/d/yyyy")
+-- 
+1.9.0
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-27 17:10:35 +0000
+++ debian/patches/series	2014-04-03 08:41:20 +0000
@@ -18,3 +18,4 @@
 V4-fix-range-sorting.patch
 V4-regalloc-fix-interval-splitting-when-register-pre.patch
 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch
+Support-RFC2822Date-date-format-similar-to-V8.patch