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

[Antonio Rojas]

    Date: Tuesday, August 27, 2019 @ 13:00:32
  Author: arojas
Revision: 361272

Update to 2.0

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

------------------------+
 PKGBUILD               |   21 +++++++-----------
 libsignon-glib-2.patch |   52 -----------------------------------------------
 2 files changed, 8 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-27 10:57:58 UTC (rev 361271)
+++ PKGBUILD	2019-08-27 13:00:32 UTC (rev 361272)
@@ -1,34 +1,29 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=telepathy-accounts-signon
-pkgver=1.0
-pkgrel=4
+pkgver=2.0
+pkgrel=1
 pkgdesc="A mission control plugin for Telepathy, integrating with libaccounts and libsignon to provide IM accounts and authentication"
 arch=(x86_64)
 url='https://gitlab.com/accounts-sso/telepathy-accounts-signon'
 license=(LGPL)
 depends=(telepathy-mission-control libaccounts-glib libsignon-glib)
-makedepends=(qt5-base)
-source=($pkgname-$pkgver.tar.gz::"https://gitlab.com/accounts-sso/$pkgname/repository/archive.tar.gz?ref=$pkgver"
-        libsignon-glib-2.patch)
-sha256sums=('9b9e4ef2f98d93ccb4d73ba6623ef38bd8f167965c68ec2486c0d9b8035a93ed'
-            '49a2ec7d48aec9e7946c41aefbeff810897815b3af2aa12d3d53be81c5eb0027')
+makedepends=(meson)
+source=($pkgname-$pkgver.tar.gz::"https://gitlab.com/accounts-sso/$pkgname/repository/archive.tar.gz?ref=$pkgver")
+sha256sums=('43fd6dc3c9c90b12e6dc806ea9a8c9cac87e514bf55156f95f4a43189e82528c')
 
 prepare() {
   mkdir -p build
   mv $pkgname-$pkgver-* $pkgname-$pkgver
-
-  cd $pkgname-$pkgver/mcp-account-manager-accounts-sso
-  patch -p2 -i ../../libsignon-glib-2.patch # Fix build with libsignon-glib 2.0
 }
 
 build() {
   cd build
-  qmake-qt5 ../$pkgname-$pkgver
-  make
+  meson ../$pkgname-$pkgver
+  ninja
 }
 
 package() {
   cd build
-  make INSTALL_ROOT="$pkgdir" install
+  DESTDIR="$pkgdir" ninja install
 }

Deleted: libsignon-glib-2.patch
===================================================================
--- libsignon-glib-2.patch	2019-08-27 10:57:58 UTC (rev 361271)
+++ libsignon-glib-2.patch	2019-08-27 13:00:32 UTC (rev 361272)
@@ -1,52 +0,0 @@
-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
-