[arch-commits] Commit in telepathy-accounts-signon/trunk (2 files)

[Antonio Rojas]

    Date: Friday, November 23, 2018 @ 21:10:20
  Author: arojas
Revision: 340358

Upload patch to svn (FS#60892)

Added:
  telepathy-accounts-signon/trunk/libsignon-glib-2.patch
Modified:
  telepathy-accounts-signon/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    6 ++---
 libsignon-glib-2.patch |   52 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-23 21:08:53 UTC (rev 340357)
+++ PKGBUILD	2018-11-23 21:10:20 UTC (rev 340358)
@@ -9,10 +9,10 @@
 license=(LGPL)
 depends=(telepathy-mission-control libaccounts-glib libsignon-glib)
 makedepends=(qt5-base)
-source=("https://gitlab.com/accounts-sso/$pkgname/repository/archive.tar.gz?ref=$pkgver"
-        libsignon-glib-2.patch::"https://gitlab.com/accounts-sso/telepathy-accounts-signon/commit/df1ef923.patch")
+source=($pkgname-$pkgver.tar.gz::"https://gitlab.com/accounts-sso/$pkgname/repository/archive.tar.gz?ref=$pkgver"
+        libsignon-glib-2.patch)
 sha256sums=('9b9e4ef2f98d93ccb4d73ba6623ef38bd8f167965c68ec2486c0d9b8035a93ed'
-            'e736cc371560c25ddbe92b7a6624355f05e72219e48df2c8c128192af0f58290')
+            '49a2ec7d48aec9e7946c41aefbeff810897815b3af2aa12d3d53be81c5eb0027')
 
 prepare() {
   mkdir -p build

Added: libsignon-glib-2.patch
===================================================================
--- libsignon-glib-2.patch	                        (rev 0)
+++ libsignon-glib-2.patch	2018-11-23 21:10:20 UTC (rev 340358)
@@ -0,0 +1,52 @@
+From df1ef92309b73670a06b4d2e52e4248be5b887f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin at elementary.io>
+Date: Mon, 10 Sep 2018 10:58:11 +0200
+Subject: [PATCH] Update to latest libsignon-glib changes
+
+---
+ src/mcp-account-manager-accounts-sso.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/mcp-account-manager-accounts-sso.c b/src/mcp-account-manager-accounts-sso.c
+index eea1b11..5943e59 100644
+--- a/src/mcp-account-manager-accounts-sso.c
++++ b/src/mcp-account-manager-accounts-sso.c
+@@ -29,7 +29,7 @@
+ #include <libaccounts-glib/ag-auth-data.h>
+ #include <libaccounts-glib/ag-provider.h>
+ 
+-#include <libsignon-glib/signon-identity.h>
++#include <libsignon-glib/signon-glib.h>
+ 
+ #include <string.h>
+ #include <ctype.h>
+@@ -308,12 +308,14 @@ typedef struct
+ } AccountCreateData;
+ 
+ static void
+-_account_created_signon_cb(SignonIdentity *signon,
+-    const SignonIdentityInfo *info,
+-    const GError *error,
++_account_created_signon_cb (GObject *source_object,
++    GAsyncResult *res,
+     gpointer user_data)
+ {
++  SignonIdentity *signon = (SignonIdentity *)source_object;
+   AccountCreateData *data = (AccountCreateData*) user_data;
++  GError *error = NULL;
++  SignonIdentityInfo * info = signon_identity_query_info_finish (signon, res, &error);
+   gchar *username = g_strdup (signon_identity_info_get_username (info));
+ 
+   g_debug("Accounts SSO: got account signon info response");
+@@ -421,7 +423,7 @@ create_account(AgAccountService *service,
+           data->self = self;
+ 
+           DEBUG("Accounts SSO: querying account info from signon");
+-          signon_identity_query_info(signon, _account_created_signon_cb, data);
++          signon_identity_query_info(signon, NULL, _account_created_signon_cb, data);
+           return;
+         }
+       else
+-- 
+2.18.1
+