Online Accounts: Sign-on UI

Merge lp:~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive into lp:signon-ui

  1. rebuild_against_qt521_and_sync_with_archive
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 127
Merged at revision: 126
Proposed branch: lp:~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive
Merge into: lp:signon-ui
Diff against target: 293 lines (+29/-95)
9 files modified
common-vars.pri (+1/-1)
debian/changelog (+7/-0)
debian/control (+1/-0)
src/browser-process/ua-overrides.js (+20/-36)
src/cookie-jar-manager.cpp (+0/-1)
src/service.cpp (+0/-44)
src/service.h (+0/-11)
src/signon-ui.pro (+0/-1)
tests/unit/test.cpp (+0/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/signon-ui/rebuild_against_qt521_and_sync_with_archive
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alberto Mardegan (community) Approve
Review via email: mp+209450@code.launchpad.net

Commit message

Rebuild against Qt 5.2.1 and do the revert similar to what was done in the archive.
(merge) Build depend on libicu-dev to fix FTBFS (LP: #1287177)

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Sadly. ;-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ui-ci/48/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common-vars.pri'
2--- common-vars.pri 2014-02-14 14:53:30 +0000
3+++ common-vars.pri 2014-03-05 13:03:22 +0000
4@@ -14,6 +14,6 @@
5 # Project version
6 # remember to update debian/* files if you changes this
7 #-----------------------------------------------------------------------------
8-PROJECT_VERSION = 0.16
9+PROJECT_VERSION = 0.15
10
11 # End of File
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2014-03-04 15:04:01 +0000
15+++ debian/changelog 2014-03-05 13:03:22 +0000
16@@ -1,3 +1,10 @@
17+signon-ui (0.16+14.04.20140304.is.0.15+14.04.20131024.2-0ubuntu1) trusty; urgency=medium
18+
19+ * Reverting as desktop image isn't installable (main/universe
20+ mismatch) and causing all signon-ui tests on Touch failing
21+
22+ -- Didier Roche <didrocks@ubuntu.com> Wed, 05 Mar 2014 12:19:29 +0100
23+
24 signon-ui (0.16+14.04.20140304-0ubuntu1) trusty; urgency=medium
25
26 [ Alberto Mardegan ]
27
28=== modified file 'debian/control'
29--- debian/control 2013-10-16 15:13:03 +0000
30+++ debian/control 2014-03-05 13:03:22 +0000
31@@ -9,6 +9,7 @@
32 libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
33 libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
34 libgstreamer-plugins-base0.10-dev,
35+ libicu-dev,
36 libnotify-dev,
37 libproxy-dev,
38 libqt5opengl5-dev,
39
40=== modified file 'src/browser-process/ua-overrides.js'
41--- src/browser-process/ua-overrides.js 2013-12-04 00:59:15 +0000
42+++ src/browser-process/ua-overrides.js 2014-03-05 13:03:22 +0000
43@@ -18,7 +18,7 @@
44
45 .pragma library
46
47-// B2G’s list of overrides: https://hg.mozilla.org/mozilla-central/raw-file/tip/b2g/app/ua-update.json.in
48+// B2G’s list of overrides: https://github.com/mozilla-b2g/gaia/blob/master/build/ua-override-prefs.js
49
50 // List of user agent string overrides in the form of an object.
51 // Each key is a domain name for which the default user agent string doesn’t
52@@ -37,33 +37,9 @@
53 // Android as a reference.
54
55 var overrides = {
56- // Google+ is special, scroll doesn't work with an AppleWebkit personality
57- "plus.google.com": ["Mobile", "Android; Mobile"],
58-
59- "google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
60- "google.co.in": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
61- "google.de": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
62- "google.co.uk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
63- "google.fr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
64- "google.com.br": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
65- "google.co.jp": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
66- "google.com.hk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
67- "google.ru": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
68- "google.it": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
69- "google.es": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
70- "google.com.mx": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
71- "google.ca": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
72- "google.com.tr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
73- "google.com.au": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
74- "google.pl": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
75-
76- "youtube.com": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) Ubuntu Mobile"],
77-
78- "twitter.com": ["Mobile)", "Mobile) Firefox"],
79-
80- // while this issue gets resolved (https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1233207)
81- "login.ubuntu.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
82-
83+ "mail.google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
84+ "google.com": ["Mobile", "Android; Mobile"],
85+ "youtube.com": ["Mobile", "Android; Mobile"],
86 "yahoo.com": ["Mobile", "Android; Mobile"],
87 "baidu.com": ["Mobile", "Android; Mobile"],
88 "qq.com": [/WebKit\/[.0-9]*/, "Apple$& Mobile"],
89@@ -71,21 +47,33 @@
90 "linkedin.com": ["Mobile", "Android; Mobile"],
91 "blogspot.com": ["Mobile", "Android; Mobile"],
92 "taobao.com": ["Mobile", "Android; Mobile"],
93+ "google.co.in": ["Mobile", "Android; Mobile"],
94 "bing.com": ["Mobile", "Android; Mobile"],
95 "yahoo.co.jp": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
96 "yandex.ru": ["Mobile", "Android; Mobile"],
97 "sina.com.cn": ["Mobile", "Android; Mobile"],
98 "ebay.com": ["Mobile", "Android; Mobile"],
99+ "google.de": ["Mobile", "Android; Mobile"],
100 "tumblr.com": ["Mobile", "Android; Mobile"],
101+ "google.co.uk": ["Mobile", "Android; Mobile"],
102 "msn.com": ["Mobile", "Android; Mobile"],
103+ "google.fr": ["Mobile", "Android; Mobile"],
104 "mail.ru": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
105+ "google.com.br": ["Mobile", "Android; Mobile"],
106+ "google.co.jp": ["Mobile", "Android; Mobile"],
107 "hao123.com": ["Mobile", "Android; Mobile"],
108 "ask.com": ["Mobile", "Android; Mobile"],
109+ "google.com.hk": ["Mobile", "Android; Mobile"],
110+ "google.ru": ["Mobile", "Android; Mobile"],
111 "blogger.com": ["Mobile", "Android; Mobile"],
112 "imdb.com": ["Mobile", "Android; Mobile"],
113+ "google.it": ["Mobile", "Android; Mobile"],
114+ "google.es": ["Mobile", "Android; Mobile"],
115 "amazon.co.jp": ["Mobile", "Android; Mobile"],
116 "tmall.com": ["Mobile", "Android; Mobile"],
117 "fc2.com": ["Mobile", "Android; Mobile"],
118+ "google.com.mx": ["Mobile", "Android; Mobile"],
119+ "google.ca": ["Mobile", "Android; Mobile"],
120 "soso.com": ["Mobile", "Android; Mobile"],
121 "delta-search.com": ["Mobile", "Android; Mobile"],
122 "odnoklassniki.ru": ["Mobile", "Android; Mobile"],
123@@ -95,21 +83,17 @@
124 "blogspot.in": ["Mobile", "Android; Mobile"],
125 "ifeng.com": ["Mobile", "Android; Mobile"],
126 "360.cn": ["Mobile", "Android; Mobile"],
127+ "google.com.tr": ["Mobile", "Android; Mobile"],
128+ "google.com.au": ["Mobile", "Android; Mobile"],
129 "youku.com": ["Mobile", "Android; Mobile"],
130 "ebay.de": ["Mobile", "Android; Mobile"],
131 "uol.com.br": ["Mobile", "Android; Mobile"],
132 "aol.com": ["Mobile", "Android; Mobile"],
133+ "google.pl": ["Mobile", "Android; Mobile"],
134 "alipay.com": ["Mobile", "Android; Mobile"],
135 "dailymotion.com": ["Mobile", "Android; Mobile Safari"],
136 "amazon.co.uk": ["Mobile", "Android; Mobile"],
137 "ebay.co.uk": ["Mobile", "Android; Mobile"],
138-
139- "facebook.com": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"],
140- // Akamai serves images for Facebook
141- "akamaihd.net": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"],
142-
143+ "facebook.com": [/WebKit\/[.0-9]*/, "Apple$& Firefox/18"],
144 "nytimes.com": ["Mobile", "Android; Mobile Safari"],
145-
146- // http://pad.lv/1223937
147- "huffpost.com": ["Mobile)", "Mobile) Firefox"],
148 };
149
150=== modified file 'src/cookie-jar-manager.cpp'
151--- src/cookie-jar-manager.cpp 2013-12-04 12:23:31 +0000
152+++ src/cookie-jar-manager.cpp 2014-03-05 13:03:22 +0000
153@@ -151,7 +151,6 @@
154 {
155 Q_D(CookieJarManager);
156
157- qRegisterMetaType<RawCookies>("RawCookies");
158 qDBusRegisterMetaType<RawCookies>();
159 qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
160
161
162=== modified file 'src/service.cpp'
163--- src/service.cpp 2013-12-05 09:45:46 +0000
164+++ src/service.cpp 2014-03-05 13:03:22 +0000
165@@ -25,11 +25,6 @@
166 #include "request.h"
167
168 #include <QDBusArgument>
169-#include <QDateTime>
170-#include <QFileInfo>
171-#include <QSqlDatabase>
172-#include <QSqlQuery>
173-#include <QStandardPaths>
174 #include <QQueue>
175
176 using namespace SignOnUi;
177@@ -83,7 +78,6 @@
178 void runQueue(RequestQueue &queue);
179 void cancelUiRequest(const QString &requestId);
180 void removeIdentityData(quint32 id);
181- RawCookies cookiesForIdentity(quint32 id, qint64 &timestamp) const;
182
183 private Q_SLOTS:
184 void onRequestCompleted();
185@@ -100,8 +94,6 @@
186 QObject(service),
187 q_ptr(service)
188 {
189- // This registers the RawCookies metatype with DBus
190- CookieJarManager::instance();
191 }
192
193 ServicePrivate::~ServicePrivate()
194@@ -206,35 +198,6 @@
195 CookieJarManager::instance()->removeForIdentity(id);
196 }
197
198-RawCookies ServicePrivate::cookiesForIdentity(quint32 id,
199- qint64 &timestamp) const
200-{
201- RawCookies cookies;
202- timestamp = 0;
203-
204- QString cachePath =
205- QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
206- QString cookiesDBFile =
207- QString("%1/id-%2/.local/share/browser-process/.QtWebKit/cookies.db")
208- .arg(cachePath).arg(id);
209-
210- QFileInfo fileInfo(cookiesDBFile);
211- if (!fileInfo.exists()) return cookies;
212- timestamp = fileInfo.lastModified().toMSecsSinceEpoch() / 1000;
213-
214- QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
215- db.setDatabaseName(cookiesDBFile);
216- if (!db.open()) return cookies;
217-
218- QSqlQuery q(db);
219- q.exec("SELECT cookieId, cookie FROM cookies;");
220- while (q.next()) {
221- cookies.insert(q.value(0).toString(), q.value(1).toString());
222- }
223-
224- return cookies;
225-}
226-
227 Service::Service(QObject *parent):
228 QObject(parent),
229 d_ptr(new ServicePrivate(this))
230@@ -291,11 +254,4 @@
231 d->removeIdentityData(id);
232 }
233
234-void Service::cookiesForIdentity(quint32 id,
235- RawCookies &cookies, qint64 &timestamp)
236-{
237- Q_D(const Service);
238- cookies = d->cookiesForIdentity(id, timestamp);
239-}
240-
241 #include "service.moc"
242
243=== modified file 'src/service.h'
244--- src/service.h 2013-12-09 11:48:25 +0000
245+++ src/service.h 2014-03-05 13:03:22 +0000
246@@ -21,8 +21,6 @@
247 #ifndef SIGNON_UI_SERVICE_H
248 #define SIGNON_UI_SERVICE_H
249
250-#include "cookie-jar-manager.h"
251-
252 #include <QDBusContext>
253 #include <QObject>
254 #include <QVariantMap>
255@@ -49,15 +47,6 @@
256 Q_NOREPLY void cancelUiRequest(const QString &requestId);
257 void removeIdentityData(quint32 id);
258
259- /*
260- * This is not officially part of the interface; it's an Ubuntu-specific
261- * experimental method, and we reserve the right to remove or change it in
262- * future releases.
263- */
264- void cookiesForIdentity(quint32 id,
265- // Output parameters
266- RawCookies &cookies, qint64 &timestamp);
267-
268 Q_SIGNALS:
269 void isIdleChanged();
270
271
272=== modified file 'src/signon-ui.pro'
273--- src/signon-ui.pro 2013-12-04 12:23:31 +0000
274+++ src/signon-ui.pro 2014-03-05 13:03:22 +0000
275@@ -16,7 +16,6 @@
276 dbus \
277 gui \
278 network \
279- sql \
280 webkit
281
282 PKGCONFIG += \
283
284=== modified file 'tests/unit/test.cpp'
285--- tests/unit/test.cpp 2014-01-27 12:52:51 +0000
286+++ tests/unit/test.cpp 2014-03-05 13:03:22 +0000
287@@ -96,7 +96,6 @@
288
289 void SignOnUiTest::testRequestWithIndicator()
290 {
291- QSKIP("Disabled until QTBUG-36475 is fixed");
292 const uint signonId = 1234;
293 const QString displayName = QLatin1String("Beautiful account");
294

Subscribers

People subscribed via source and target branches

to all changes: