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

[Alberto Mardegan]

Migrate to GTask

[lp:~online-accounts/libaccounts-glib/packaging]

196. By Alberto Mardegan on 2016-05-20

Migrate to GTask Fixes: #1451728

=== added file '.gitlab-ci.yml'
--- .gitlab-ci.yml	1970-01-01 00:00:00 +0000
+++ .gitlab-ci.yml	2016-05-20 08:55:52 +0000
@@ -0,0 +1,51 @@
+image: ubuntu:xenial
+
+cache:
+  key: apt-cache
+  paths:
+  - apt-cache/
+
+before_script:
+  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -yq automake autotools-dev gobject-introspection gtk-doc-tools intltool libgirepository1.0-dev libglib2.0-dev libsqlite3-dev libtool libxml2-dev libxml2-utils python3 python3-gi python-gi-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -yq check dbus-test-runner lcov gcovr
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -yq sudo
+  - useradd -m tester
+  - adduser tester sudo
+
+build_amd64:
+  stage: build
+  script:
+    - export PYTHON=python3
+    - mkdir build
+    - cd build
+    - ../autogen.sh --enable-gtk-doc --enable-gcov --enable-debug --enable-python --disable-wal
+    - make -j 4
+  artifacts:
+    paths:
+      - ./
+
+test_amd64:
+  stage: test
+  script:
+    - cd build
+    - chmod a+rw -R .
+    - sudo -u tester make check || (cat tests/test-suite.log && /bin/false)
+    - sudo -u tester make coverage-html
+  dependencies:
+    - build_amd64
+  artifacts:
+    paths:
+      - ./
+
+pages:
+  stage: deploy
+  script:
+    - mkdir public
+    - cp -a build/coveragereport public/coverage
+    - cp -a build/docs/reference/html/* public/
+  dependencies:
+    - test_amd64
+  artifacts:
+    paths:
+      - public
 
=== modified file 'NEWS'
--- NEWS	2016-02-19 09:42:37 +0000
+++ NEWS	2016-05-20 08:55:52 +0000
@@ -1,5 +1,12 @@
 libaccounts-glib NEWS
 
+Version 1.22
+------------
+
+* Lib: migrate to GTask
+* Build: enable CI in gitlab
+* Build: add support for lcov 1.12
+
 Version 1.21
 ------------
 
 
=== modified file 'README.md'
--- README.md	2015-09-11 15:07:12 +0000
+++ README.md	2016-05-20 08:55:52 +0000
@@ -2,7 +2,7 @@
 =================================================
 
 This project is a library for managing accounts which can be used from GLib
-applications. It is part of the @accounts-sso project.
+applications. It is part of the [accounts-sso project][accounts-sso].
 
 
 License
@@ -15,7 +15,7 @@
 ------------------
 
 The project depends on GLib (including GIO and GObject), libxml2, sqlite3 and
-check.
+[check][].
 To build it, run:
 ```
 ./autogen.sh
@@ -23,3 +23,13 @@
 make
 make install
 ```
+
+Resources
+---------
+
+[API reference documentation](http://accounts-sso.gitlab.io/libaccounts-glib/)
+
+[Official source code repository](https://gitlab.com/accounts-sso/libaccounts-glib)
+
+[accounts-sso]: https://gitlab.com/groups/accounts-sso
+[check]: https://github.com/libcheck/check
 
=== modified file 'configure.ac'
--- configure.ac	2016-02-19 09:42:37 +0000
+++ configure.ac	2016-05-20 08:55:52 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libaccounts-glib],
-        [1.21],
+        [1.22],
         [https://gitlab.com/accounts-sso/libaccounts-glib/issues],
         [libaccounts-glib],
         [https://gitlab.com/accounts-sso/libaccounts-glib])
@@ -25,7 +25,7 @@
 GOBJECT_INTROSPECTION_CHECK([1.30.0])
 
 LIBACCOUNTS_REQUIRED="glib-2.0 >= 2.26
-     gio-2.0 >= 2.30
+     gio-2.0 >= 2.36
      gio-unix-2.0
      gobject-2.0 >= 2.35.1
      libxml-2.0
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-02-22 09:12:59 +0000
+++ debian/changelog	2016-05-20 08:55:52 +0000
@@ -1,3 +1,12 @@
+libaccounts-glib (1.22-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Lib: migrate to GTask (LP: #1577373)
+    - Build: enable CI in gitlab
+    - Build: add support for lcov 1.12
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 20 May 2016 11:54:22 +0300
+
 libaccounts-glib (1.21+16.04.20160222-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'libaccounts-glib/ag-account.c'
--- libaccounts-glib/ag-account.c	2015-12-18 15:16:14 +0000
+++ libaccounts-glib/ag-account.c	2016-05-20 08:55:52 +0000
@@ -4,7 +4,7 @@
  * This file is part of libaccounts-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -185,8 +185,8 @@
      */
     GHashTable *changes_for_watches;
 
-    /* GSimpleAsyncResult for the ag_account_store_async operation. */
-    GSimpleAsyncResult *store_async_result;
+    /* GTask for the ag_account_store_async operation. */
+    GTask *store_task;
 
     /* The "foreign" flag means that the account has been created by another
      * instance and we got informed about it from D-Bus. In this case, all the
@@ -697,10 +697,7 @@
 {
     AgAccountPrivate *priv = account->priv;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    g_simple_async_result_complete_in_idle (priv->store_async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
-    g_clear_object (&priv->store_async_result);
+    g_clear_object (&priv->store_task);
 
     _ag_account_changes_free (changes);
 }
@@ -2486,43 +2483,32 @@
     g_return_if_fail (AG_IS_ACCOUNT (account));
     priv = account->priv;
 
-    if (G_UNLIKELY (priv->store_async_result != NULL))
+    if (G_UNLIKELY (priv->store_task != NULL))
     {
         g_critical ("ag_account_store_async called again before completion");
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_report_error_in_idle ((GObject *)account,
-                                             callback, user_data,
-                                             AG_ACCOUNTS_ERROR,
-                                             AG_ACCOUNTS_ERROR_STORE_IN_PROGRESS,
-                                             "Store operation already "
-                                             "in progress");
-G_GNUC_END_IGNORE_DEPRECATIONS
+        g_task_report_new_error (account,
+                                 callback, user_data,
+                                 ag_account_store_async,
+                                 AG_ACCOUNTS_ERROR,
+                                 AG_ACCOUNTS_ERROR_STORE_IN_PROGRESS,
+                                 "Store operation already in progress");
         return;
     }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    priv->store_async_result =
-        g_simple_async_result_new ((GObject *)account,
-                                   callback, user_data,
-                                   ag_account_store_async);
-    g_simple_async_result_set_check_cancellable (priv->store_async_result,
-                                                 cancellable);
-G_GNUC_END_IGNORE_DEPRECATIONS
-    g_object_add_weak_pointer ((GObject *)priv->store_async_result,
-                               (gpointer *)&priv->store_async_result);
+    priv->store_task =
+        g_task_new (account, cancellable, callback, user_data);
+    g_object_add_weak_pointer ((GObject *)priv->store_task,
+                               (gpointer *)&priv->store_task);
 
     if (G_UNLIKELY (priv->changes == NULL))
     {
         /* Nothing to do: invoke the callback immediately */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_result_complete_in_idle (priv->store_async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
-        g_clear_object (&priv->store_async_result);
+        g_task_return_boolean (priv->store_task, TRUE);
+        g_clear_object (&priv->store_task);
         return;
     }
 
-    _ag_manager_store_async (priv->manager, account,
-                             priv->store_async_result, cancellable);
+    _ag_manager_store_async (priv->manager, account, priv->store_task);
 }
 
 /**
@@ -2542,14 +2528,9 @@
 ag_account_store_finish (AgAccount *account, GAsyncResult *res,
                          GError **error)
 {
-    GSimpleAsyncResult *async_result;
-
     g_return_val_if_fail (AG_IS_ACCOUNT (account), FALSE);
 
-    async_result = (GSimpleAsyncResult *)res;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    return !g_simple_async_result_propagate_error (async_result, error);
-G_GNUC_END_IGNORE_DEPRECATIONS
+    return g_task_propagate_boolean (G_TASK (res), error);
 }
 
 /**
 
=== modified file 'libaccounts-glib/ag-internals.h'
--- libaccounts-glib/ag-internals.h	2013-12-23 15:22:56 +0000
+++ libaccounts-glib/ag-internals.h	2016-05-20 08:55:52 +0000
@@ -4,7 +4,7 @@
  * This file is part of libaccounts-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
@@ -95,8 +95,7 @@
 void _ag_manager_exec_transaction (AgManager *manager, const gchar *sql,
                                    AgAccountChanges *changes,
                                    AgAccount *account,
-                                   GSimpleAsyncResult *async_result,
-                                   GCancellable *cancellable);
+                                   GTask *task);
 
 typedef gboolean (*AgQueryCallback) (sqlite3_stmt *stmt, gpointer user_data);
 
@@ -125,8 +124,7 @@
 
 G_GNUC_INTERNAL
 void _ag_manager_store_async (AgManager *manager, AgAccount *account,
-                              GSimpleAsyncResult *async_result,
-                              GCancellable *cancellable);
+                              GTask *task);
 G_GNUC_INTERNAL
 gboolean _ag_manager_store_sync (AgManager *manager, AgAccount *account,
                                  GError **error);
 
=== modified file 'libaccounts-glib/ag-manager.c'
--- libaccounts-glib/ag-manager.c	2016-02-18 19:37:45 +0000
+++ libaccounts-glib/ag-manager.c	2016-05-20 08:55:52 +0000
@@ -4,7 +4,7 @@
  * This file is part of libaccounts-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  * Copyright (C) 2012 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>
@@ -148,8 +148,7 @@
     gchar *sql;
     AgAccountChanges *changes;
     guint id;
-    GSimpleAsyncResult *async_result;
-    GCancellable *cancellable;
+    GTask *task;
 } StoreCbData;
 
 typedef struct {
@@ -183,27 +182,23 @@
                     gpointer user_data)
 {
     GDBusConnection *conn = G_DBUS_CONNECTION (object);
-    GSimpleAsyncResult *async_result = user_data;
+    GTask *task = user_data;
     GVariant *result;
     GError *error_int = NULL;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     result = g_dbus_connection_call_finish (conn, res, &error_int);
     if (G_UNLIKELY (error_int))
     {
         /* We always report a read-only error here */
-        GError error = {
-            AG_ACCOUNTS_ERROR,
-            AG_ACCOUNTS_ERROR_READONLY,
-            error_int->message
-        };
-        g_simple_async_result_set_from_error (async_result, &error);
+        g_task_return_new_error (task,
+                                 AG_ACCOUNTS_ERROR,
+                                 AG_ACCOUNTS_ERROR_READONLY,
+                                 "%s", error_int->message);
         g_error_free (error_int);
     }
     else
     {
-        GObject *source =
-            g_async_result_get_source_object ((GAsyncResult *)async_result);
+        GObject *source = g_task_get_source_object (task);
         AgAccount *account = AG_ACCOUNT (source);
         /* If this was a new account, we must update the local data
          * structure */
@@ -213,42 +208,37 @@
             AgAccountChanges *changes;
 
             g_variant_get_child (result, 0, "u", &account->id);
-            changes = g_object_get_data ((GObject *)async_result,
+            changes = g_object_get_data ((GObject *)task,
                                          key_remote_changes);
             _ag_account_done_changes (account, changes);
         }
         g_variant_unref (result);
+        g_task_return_boolean (task, TRUE);
     }
 
-    g_simple_async_result_complete_in_idle (async_result);
-    g_object_unref (async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
+    g_object_unref (task);
 }
 
 static void
 ag_manager_store_dbus_async (AgManager *manager, AgAccount *account,
-                             GSimpleAsyncResult *async_result,
-                             GCancellable *cancellable)
+                             GTask *task)
 {
     AgManagerPrivate *priv = manager->priv;
     AgAccountChanges *changes;
     GVariant *dbus_changes;
 
     if (G_UNLIKELY (!priv->use_dbus)) {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_result_set_error (async_result,
-                                         AG_ACCOUNTS_ERROR,
-                                         AG_ACCOUNTS_ERROR_READONLY,
-                                         "DB read-only and D-Bus disabled");
-        g_simple_async_result_complete_in_idle (async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
-        g_object_unref (async_result);
+        g_task_return_new_error (task,
+                                 AG_ACCOUNTS_ERROR,
+                                 AG_ACCOUNTS_ERROR_READONLY,
+                                 "DB read-only and D-Bus disabled");
+        g_object_unref (task);
         return;
     }
 
     changes = _ag_account_steal_changes (account);
     dbus_changes = _ag_account_build_dbus_changes (account, changes, NULL);
-    g_object_set_data_full ((GObject *)async_result,
+    g_object_set_data_full ((GObject *)task,
                             key_remote_changes, changes,
                             (GDestroyNotify) _ag_account_changes_free);
 
@@ -261,9 +251,9 @@
                             NULL,
                             G_DBUS_CALL_FLAGS_NONE,
                             -1,
-                            cancellable,
+                            g_task_get_cancellable (task),
                             (GAsyncReadyCallback)on_dbus_store_done,
-                            async_result);
+                            task);
 }
 
 static gboolean
@@ -1095,11 +1085,9 @@
     g_object_ref (account);
 
     /* If the operation was cancelled, abort it. */
-    if (sd->cancellable != NULL)
+    if (g_task_return_error_if_cancelled (sd->task))
     {
-        g_cancellable_set_error_if_cancelled (sd->cancellable, &error);
-        if (error != NULL)
-            goto finish;
+        goto finish;
     }
 
     g_return_val_if_fail (priv->begin_stmt != NULL, FALSE);
@@ -1125,9 +1113,11 @@
 finish:
     if (error != NULL)
     {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_result_take_error (sd->async_result, error);
-G_GNUC_END_IGNORE_DEPRECATIONS
+        g_task_return_error (sd->task, error);
+    }
+    else
+    {
+        g_task_return_boolean (sd->task, TRUE);
     }
 
     _ag_account_store_completed (account, sd->changes);
@@ -2390,8 +2380,7 @@
 void
 _ag_manager_exec_transaction (AgManager *manager, const gchar *sql,
                               AgAccountChanges *changes, AgAccount *account,
-                              GSimpleAsyncResult *async_result,
-                              GCancellable *cancellable)
+                              GTask *task)
 {
     AgManagerPrivate *priv = manager->priv;
     GError *error = NULL;
@@ -2413,8 +2402,7 @@
         sd->manager = manager;
         sd->account = account;
         sd->changes = changes;
-        sd->async_result = async_result;
-        sd->cancellable = cancellable;
+        sd->task = task;
         sd->sql = g_strdup (sql);
         sd->id = g_idle_add ((GSourceFunc)exec_transaction_idle, sd);
         priv->locks = g_list_prepend (priv->locks, sd);
@@ -2432,9 +2420,11 @@
 finish:
     if (error != NULL)
     {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_result_take_error (async_result, error);
-G_GNUC_END_IGNORE_DEPRECATIONS
+        g_task_return_error (task, error);
+    }
+    else
+    {
+        g_task_return_boolean (task, TRUE);
     }
 
     _ag_account_store_completed (account, changes);
@@ -2485,8 +2475,7 @@
 
 static void
 ag_manager_store_local_async (AgManager *manager, AgAccount *account,
-                              GSimpleAsyncResult *async_result,
-                              GCancellable *cancellable)
+                              GTask *task)
 {
     AgAccountChanges *changes;
     GError *error = NULL;
@@ -2495,19 +2484,14 @@
     sql = _ag_account_get_store_sql (account, &error);
     if (G_UNLIKELY (error))
     {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-        g_simple_async_result_take_error (async_result,
-                                          error);
-        g_simple_async_result_complete_in_idle (async_result);
-G_GNUC_END_IGNORE_DEPRECATIONS
-        g_object_unref (async_result);
+        g_task_return_error (task, error);
+        g_object_unref (task);
         return;
     }
 
     changes = _ag_account_steal_changes (account);
 
-    _ag_manager_exec_transaction (manager, sql, changes, account,
-                                  async_result, cancellable);
+    _ag_manager_exec_transaction (manager, sql, changes, account, task);
     g_free (sql);
 }
 
@@ -2547,18 +2531,15 @@
 
 void
 _ag_manager_store_async (AgManager *manager, AgAccount *account,
-                         GSimpleAsyncResult *async_result,
-                         GCancellable *cancellable)
+                         GTask *task)
 {
     if (manager->priv->is_readonly)
     {
-        ag_manager_store_dbus_async (manager, account, async_result,
-                                     cancellable);
+        ag_manager_store_dbus_async (manager, account, task);
     }
     else
     {
-        ag_manager_store_local_async (manager, account, async_result,
-                                      cancellable);
+        ag_manager_store_local_async (manager, account, task);
     }
 }
 
 
=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2015-07-09 10:16:42 +0000
+++ m4/gcov.m4	2016-05-20 08:55:52 +0000
@@ -46,7 +46,7 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)