Online Accounts: libaccounts-qt

Merge lp:~online-accounts/libaccounts-qt/packaging into lp:libaccounts-qt

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 145
Proposed branch: lp:~online-accounts/libaccounts-qt/packaging
Merge into: lp:libaccounts-qt
Diff against target: 405 lines (+73/-77)
20 files modified
Accounts/account-service.cpp (+8/-6)
Accounts/account.cpp (+3/-3)
Accounts/account.h (+1/-1)
Accounts/accountscommon.h (+1/-1)
Accounts/auth-data.cpp (+1/-0)
Accounts/manager.cpp (+1/-1)
Accounts/provider.cpp (+2/-2)
Accounts/service-type.cpp (+2/-2)
Accounts/service.cpp (+2/-2)
Accounts/utils.cpp (+4/-1)
README (+0/-1)
README.md (+23/-0)
common-vars.pri (+1/-1)
debian/changelog (+17/-0)
debian/control (+0/-22)
debian/libaccounts-qt-dev.install (+0/-4)
debian/libaccounts-qt1.install (+0/-1)
debian/rules (+2/-27)
tests/accountstest-wrapper.sh (+3/-0)
tests/accountstest.sh (+2/-2)
To merge this branch: bzr merge lp:~online-accounts/libaccounts-qt/packaging
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+269386@code.launchpad.net

Commit message

New upstream release.

- Use gboolean instead of bool to g_object_get (fixes a stack corruption)
- Headers: remove unnecessary semicolon after namespace
- Docs: fix hint on destruction of Account and Service
- Fix memory leaks found by valgrind
  Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239
- Tests: make using a wrapper easier
  Tests can now be run with a command like:
    make check WRAPPER="valgrind --leak-check=full"

Description of the change

New upstream release.

- Use gboolean instead of bool to g_object_get (fixes a stack corruption)
- Headers: remove unnecessary semicolon after namespace
- Docs: fix hint on destruction of Account and Service
- Fix memory leaks found by valgrind
  Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239
- Tests: make using a wrapper easier
  Tests can now be run with a command like:
    make check WRAPPER="valgrind --leak-check=full"

To post a comment you must log in.
lp:~online-accounts/libaccounts-qt/packaging updated
144. By Alberto Mardegan

Sync from archive

* No-change test rebuild for g++5 ABI transition
* fix typo in previous upload
* debian/control:
  - add "Multi-Arch: same" to libaccounts-qt1 and libaccounts-qt5-1
    (no further changes needed thanks to dh9)
  - add Vcs-Bzr field

145. By Alberto Mardegan

New upstream release.

- Use gboolean instead of bool to g_object_get (fixes a stack corruption)
- Headers: remove unnecessary semicolon after namespace
- Docs: fix hint on destruction of Account and Service
- Fix memory leaks found by valgrind
  Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239
- Tests: make using a wrapper easier
  Tests can now be run with a command like:
    make check WRAPPER="valgrind --leak-check=full"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Accounts/account-service.cpp'
2--- Accounts/account-service.cpp 2013-06-17 10:19:48 +0000
3+++ Accounts/account-service.cpp 2015-11-02 09:11:46 +0000
4@@ -204,7 +204,7 @@
5 }
6
7 /*!
8- * Return the Account.
9+ * Return the Account. Do not delete this object explicitly.
10 */
11 Account *AccountService::account() const
12 {
13@@ -213,7 +213,7 @@
14 }
15
16 /*!
17- * Return the Service. Do not delete this object explicitly.
18+ * Return the Service.
19 */
20 Service AccountService::service() const
21 {
22@@ -282,7 +282,7 @@
23 QStringList groups, all_keys;
24
25 all_keys = allKeys();
26- Q_FOREACH (QString key, all_keys)
27+ Q_FOREACH (const QString &key, all_keys)
28 {
29 if (key.contains(slash)) {
30 QString group = key.section(slash, 0, 0);
31@@ -301,7 +301,7 @@
32 QStringList keys, all_keys;
33
34 all_keys = allKeys();
35- Q_FOREACH (QString key, all_keys)
36+ Q_FOREACH (const QString &key, all_keys)
37 {
38 if (!key.contains(slash))
39 keys.append(key);
40@@ -367,7 +367,7 @@
41 {
42 /* delete all keys in the group */
43 QStringList keys = allKeys();
44- Q_FOREACH (QString key, keys)
45+ Q_FOREACH (const QString &key, keys)
46 {
47 if (!key.isEmpty())
48 remove(key);
49@@ -504,5 +504,7 @@
50
51 AgAuthData *agAuthData =
52 ag_account_service_get_auth_data(d->m_accountService);
53- return AuthData(agAuthData);
54+ AuthData authData(agAuthData);
55+ ag_auth_data_unref(agAuthData);
56+ return authData;
57 }
58
59=== modified file 'Accounts/account.cpp'
60--- Accounts/account.cpp 2013-06-17 10:19:48 +0000
61+++ Accounts/account.cpp 2015-11-02 09:11:46 +0000
62@@ -487,7 +487,7 @@
63 QStringList groups, all_keys;
64
65 all_keys = allKeys();
66- Q_FOREACH (QString key, all_keys)
67+ Q_FOREACH (const QString &key, all_keys)
68 {
69 if (key.contains(slash)) {
70 QString group = key.section(slash, 0, 0);
71@@ -508,7 +508,7 @@
72 QStringList keys, all_keys;
73
74 all_keys = allKeys();
75- Q_FOREACH (QString key, all_keys)
76+ Q_FOREACH (const QString &key, all_keys)
77 {
78 if (!key.contains(slash))
79 keys.append(key);
80@@ -586,7 +586,7 @@
81 {
82 /* delete all keys in the group */
83 QStringList keys = allKeys();
84- Q_FOREACH (QString key, keys)
85+ Q_FOREACH (const QString &key, keys)
86 {
87 if (!key.isEmpty())
88 remove(key);
89
90=== modified file 'Accounts/account.h'
91--- Accounts/account.h 2013-06-17 10:19:48 +0000
92+++ Accounts/account.h 2015-11-02 09:11:46 +0000
93@@ -33,7 +33,7 @@
94 #include "Accounts/error.h"
95 #include "Accounts/service.h"
96
97-#define ACCOUNTS_KEY_CREDENTIALS_ID QLatin1String("CredentialsId")
98+#define ACCOUNTS_KEY_CREDENTIALS_ID QStringLiteral("CredentialsId")
99 #include <QObject>
100 #include <QStringList>
101 #include <QVariant>
102
103=== modified file 'Accounts/accountscommon.h'
104--- Accounts/accountscommon.h 2012-03-20 06:33:27 +0000
105+++ Accounts/accountscommon.h 2015-11-02 09:11:46 +0000
106@@ -69,6 +69,6 @@
107 StealReference,
108 };
109
110-}; // namespace
111+} // namespace
112
113 #endif /* ACCOUNTSCOMMON_H_ */
114
115=== modified file 'Accounts/auth-data.cpp'
116--- Accounts/auth-data.cpp 2013-01-18 11:55:30 +0000
117+++ Accounts/auth-data.cpp 2015-11-02 09:11:46 +0000
118@@ -109,6 +109,7 @@
119 if (glibParameters == 0) return QVariantMap();
120
121 QVariant variant = gVariantToQVariant(glibParameters);
122+ g_variant_unref(glibParameters);
123 if (!variant.isValid()) return QVariantMap();
124
125 return variant.toMap();
126
127=== modified file 'Accounts/manager.cpp'
128--- Accounts/manager.cpp 2014-08-14 14:50:11 +0000
129+++ Accounts/manager.cpp 2015-11-02 09:11:46 +0000
130@@ -530,7 +530,7 @@
131 */
132 Manager::Options Manager::options() const
133 {
134- bool useDBus = true;
135+ gboolean useDBus = true;
136 g_object_get(d->m_manager,
137 "use-dbus", &useDBus,
138 NULL);
139
140=== modified file 'Accounts/provider.cpp'
141--- Accounts/provider.cpp 2014-03-10 10:22:42 +0000
142+++ Accounts/provider.cpp 2015-11-02 09:11:46 +0000
143@@ -187,9 +187,9 @@
144 if (!doc.setContent(QByteArray(data), true,
145 &errorStr, &errorLine, &errorColumn))
146 {
147- QString message(ASCII("Parse error reading account provider file "
148+ QString message(QStringLiteral("Parse error reading account provider file "
149 "at line %1, column %2:\n%3"));
150- message.arg(errorLine).arg(errorColumn).arg(errorStr);
151+ message = message.arg(errorLine).arg(errorColumn).arg(errorStr);
152 qWarning() << __PRETTY_FUNCTION__ << message;
153 }
154
155
156=== modified file 'Accounts/service-type.cpp'
157--- Accounts/service-type.cpp 2013-06-13 07:19:00 +0000
158+++ Accounts/service-type.cpp 2015-11-02 09:11:46 +0000
159@@ -202,9 +202,9 @@
160 int errorColumn;
161 if (!doc.setContent(QByteArray(data, len), true,
162 &errorStr, &errorLine, &errorColumn)) {
163- QString message(ASCII("Parse error reading serviceType file "
164+ QString message(QStringLiteral("Parse error reading serviceType file "
165 "at line %1, column %2:\n%3"));
166- message.arg(errorLine).arg(errorColumn).arg(errorStr);
167+ message = message.arg(errorLine).arg(errorColumn).arg(errorStr);
168 qWarning() << __PRETTY_FUNCTION__ << message;
169 }
170
171
172=== modified file 'Accounts/service.cpp'
173--- Accounts/service.cpp 2013-06-13 07:19:00 +0000
174+++ Accounts/service.cpp 2015-11-02 09:11:46 +0000
175@@ -211,9 +211,9 @@
176 if (!doc.setContent(QByteArray(data), true,
177 &errorStr, &errorLine, &errorColumn))
178 {
179- QString message(ASCII("Parse error reading account service file "
180+ QString message(QStringLiteral("Parse error reading account service file "
181 "at line %1, column %2:\n%3"));
182- message.arg(errorLine).arg(errorColumn).arg(errorStr);
183+ message = message.arg(errorLine).arg(errorColumn).arg(errorStr);
184 qWarning() << __PRETTY_FUNCTION__ << message;
185 }
186 return doc;
187
188=== modified file 'Accounts/utils.cpp'
189--- Accounts/utils.cpp 2013-02-20 14:47:31 +0000
190+++ Accounts/utils.cpp 2015-11-02 09:11:46 +0000
191@@ -32,12 +32,14 @@
192 {
193 QVariantMap ret;
194 GVariantIter iter;
195- const gchar *key;
196+ gchar *key;
197 GVariant *value;
198
199 g_variant_iter_init (&iter, variant);
200 while (g_variant_iter_next (&iter, "{sv}", &key, &value)) {
201 ret.insert(UTF8(key), gVariantToQVariant(value));
202+ g_variant_unref(value);
203+ g_free(key);
204 }
205
206 return ret;
207@@ -60,6 +62,7 @@
208
209 gsize length;
210 const gchar **strings = g_variant_get_strv(variant, &length);
211+ ret.reserve(length);
212 for (gsize i = 0; i < length; i++) {
213 ret.append(UTF8(strings[i]));
214 }
215
216=== removed file 'README'
217--- README 2010-03-08 12:41:43 +0000
218+++ README 1970-01-01 00:00:00 +0000
219@@ -1,1 +0,0 @@
220-
221
222=== added file 'README.md'
223--- README.md 1970-01-01 00:00:00 +0000
224+++ README.md 2015-11-02 09:11:46 +0000
225@@ -0,0 +1,23 @@
226+Accounts management library for Qt applications
227+=================================================
228+
229+This project is a library for managing accounts which can be used from Qt
230+applications. It is part of the @accounts-sso project.
231+
232+
233+License
234+-------
235+
236+See COPYING file.
237+
238+
239+Build instructions
240+------------------
241+
242+The project depends on Qt 5 and [libaccounts-glib](https://gitlab.com/accounts-sso/libaccounts-glib).
243+To build it, run:
244+```
245+qmake
246+make
247+make install
248+```
249
250=== modified file 'common-vars.pri'
251--- common-vars.pri 2014-08-15 10:43:30 +0000
252+++ common-vars.pri 2015-11-02 09:11:46 +0000
253@@ -13,7 +13,7 @@
254 #-----------------------------------------------------------------------------
255 # Project version
256 #-----------------------------------------------------------------------------
257-PROJECT_VERSION = 1.13
258+PROJECT_VERSION = 1.14
259
260 #-----------------------------------------------------------------------------
261 # Library version
262
263=== modified file 'debian/changelog'
264--- debian/changelog 2015-11-02 09:08:40 +0000
265+++ debian/changelog 2015-11-02 09:11:46 +0000
266@@ -1,3 +1,20 @@
267+libaccounts-qt (1.14-0ubuntu1) UNRELEASED; urgency=medium
268+
269+ * debian/control, debian/rules:
270+ - Remove Qt4-based packages
271+ * New upstream release.
272+ - Fix clazy warnings
273+ - Use gboolean instead of bool to g_object_get (fixes a stack corruption)
274+ - Headers: remove unnecessary semicolon after namespace
275+ - Docs: fix hint on destruction of Account and Service
276+ - Fix memory leaks found by valgrind
277+ Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239
278+ - Tests: make using a wrapper easier
279+ Tests can now be run with a command like:
280+ make check WRAPPER="valgrind --leak-check=full"
281+
282+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 30 Sep 2015 11:57:20 +0300
283+
284 libaccounts-qt (1.13+14.10.20140819.1-0ubuntu4~gcc5.1) wily; urgency=medium
285
286 * No-change test rebuild for g++5 ABI transition
287
288=== modified file 'debian/control'
289--- debian/control 2015-11-02 09:08:40 +0000
290+++ debian/control 2015-11-02 09:11:46 +0000
291@@ -18,28 +18,6 @@
292 Homepage: http://code.google.com/p/accounts-sso/
293 Vcs-Bzr: https://code.launchpad.net/~online-accounts/libaccounts-qt/trunk
294
295-Package: libaccounts-qt1
296-Section: libs
297-Architecture: any
298-Multi-Arch: same
299-Pre-Depends: ${misc:Pre-Depends}
300-Depends: ${shlibs:Depends}, ${misc:Depends}
301-Description: QT library for single sign on
302- .
303- This package contains shared libraries to be used by applications.
304-
305-Package: libaccounts-qt-dev
306-Section: libdevel
307-Architecture: any
308-Depends: libaccounts-qt1 (= ${binary:Version}),
309- ${shlibs:Depends},
310- ${misc:Depends}
311-Breaks: libaccounts-qt5-dev (<< 1.11+14.04.20140410)
312-Replaces: libaccounts-qt5-dev (<< 1.11+14.04.20140410)
313-Description: QT library for single sign on - development files
314- .
315- This package contains files that are needed to build applications.
316-
317 Package: libaccounts-qt5-1
318 Section: libs
319 Architecture: any
320
321=== removed file 'debian/libaccounts-qt-dev.install'
322--- debian/libaccounts-qt-dev.install 2014-03-14 09:42:50 +0000
323+++ debian/libaccounts-qt-dev.install 1970-01-01 00:00:00 +0000
324@@ -1,4 +0,0 @@
325-usr/include/accounts-qt
326-usr/lib/*/cmake/AccountsQt/*
327-usr/lib/*/libaccounts-qt.so
328-usr/lib/*/pkgconfig/accounts-qt.pc
329
330=== removed file 'debian/libaccounts-qt1.install'
331--- debian/libaccounts-qt1.install 2013-02-19 10:58:32 +0000
332+++ debian/libaccounts-qt1.install 1970-01-01 00:00:00 +0000
333@@ -1,1 +0,0 @@
334-usr/lib/*/libaccounts-qt.so.*
335
336=== modified file 'debian/rules'
337--- debian/rules 2013-02-19 10:58:32 +0000
338+++ debian/rules 2015-11-02 09:11:46 +0000
339@@ -6,41 +6,16 @@
340 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
341
342 override_dh_auto_configure:
343- mkdir -p build/qt4 build/qt5
344- QT_SELECT=qt4 \
345- dh_auto_configure -Bbuild/qt4 \
346- -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
347- BUILD_DIR=build/qt4 \
348- "QMAKE_CXXFLAGS=$(CFLAGS)" \
349- ../../accounts-qt.pro
350 QT_SELECT=qt5 \
351- dh_auto_configure -Bbuild/qt5 \
352+ dh_auto_configure \
353 -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
354- BUILD_DIR=build/qt5 \
355 "QMAKE_CXXFLAGS=$(CFLAGS)" \
356- ../../accounts-qt.pro
357-
358-override_dh_auto_build:
359- dh_auto_build -Bbuild/qt4
360- dh_auto_build -Bbuild/qt5
361-
362-override_dh_auto_clean:
363- dh_auto_clean -Bbuild/qt4
364- dh_auto_clean -Bbuild/qt5
365-
366-override_dh_auto_install:
367- dh_auto_install -Bbuild/qt5 -plibaccounts-qt5-1
368- dh_auto_install -Bbuild/qt5 -plibaccounts-qt5-dev
369- dh_auto_install -Bbuild/qt4
370+ accounts-qt.pro
371
372 override_dh_install:
373 rm -f debian/tmp/usr/share/libaccounts-qt-tests/*
374 rm -f debian/tmp/usr/bin/*
375 dh_install --fail-missing
376
377-override_dh_auto_test:
378- cd build/qt4; dbus-test-runner -t make -p check; cd -
379- cd build/qt5; dbus-test-runner -t make -p check; cd -
380-
381 %:
382 dh $@
383
384=== added file 'tests/accountstest-wrapper.sh'
385--- tests/accountstest-wrapper.sh 1970-01-01 00:00:00 +0000
386+++ tests/accountstest-wrapper.sh 2015-11-02 09:11:46 +0000
387@@ -0,0 +1,3 @@
388+#!/bin/sh
389+
390+exec $WRAPPER ./accountstest
391
392=== modified file 'tests/accountstest.sh'
393--- tests/accountstest.sh 2013-06-11 12:40:03 +0000
394+++ tests/accountstest.sh 2015-11-02 09:11:46 +0000
395@@ -11,8 +11,8 @@
396 # session
397 if command -v dbus-test-runner > /dev/null ; then
398 echo "Using dbus-test-runner"
399- dbus-test-runner -m 180 -t ./accountstest
400+ dbus-test-runner --keep-env -m 180 -t "${TESTDIR}/accountstest-wrapper.sh"
401 else
402 echo "Using existing D-Bus session"
403- $WRAPPER ./accountstest "$@"
404+ "${TESTDIR}/accountstest-wrapper.sh"
405 fi

Subscribers

No one subscribed via source and target branches