[arch-commits] Commit in libcloudproviders/trunk (2 files)

[Jan Steffens]

    Date: Saturday, September 26, 2020 @ 23:04:46
  Author: heftig
Revision: 396675

0.3.1-2

Modified:
  libcloudproviders/trunk/PKGBUILD
Deleted:
  libcloudproviders/trunk/0001-collector-Always-return-a-new-reference-to-the-singl.patch

-----------------------------------------------------------------+
 0001-collector-Always-return-a-new-reference-to-the-singl.patch |   39 ----------
 PKGBUILD                                                        |   30 +++----
 2 files changed, 14 insertions(+), 55 deletions(-)

Deleted: 0001-collector-Always-return-a-new-reference-to-the-singl.patch
===================================================================
--- 0001-collector-Always-return-a-new-reference-to-the-singl.patch	2020-09-26 23:04:11 UTC (rev 396674)
+++ 0001-collector-Always-return-a-new-reference-to-the-singl.patch	2020-09-26 23:04:46 UTC (rev 396675)
@@ -1,39 +0,0 @@
-From 2e11b93fa0a7f3ac97b894ad0c3ed58bde73d7b4 Mon Sep 17 00:00:00 2001
-Message-Id: <2e11b93fa0a7f3ac97b894ad0c3ed58bde73d7b4.1517303991.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 30 Jan 2018 10:14:56 +0100
-Subject: [PATCH] collector: Always return a new reference to the singleton
-
-Don't hand out our own reference with the newly created singleton, since
-our pointer might become invalid if all the references we gave out were
-removed.
-
-Fixes a crash happening when opening a second file chooser dialog in
-GEdit, Builder or Firefox. Doesn't trigger in the widget factory,
-though.
----
- src/cloudproviderscollector.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/cloudproviderscollector.c b/src/cloudproviderscollector.c
-index 6993bec..12fa0f2 100644
---- a/src/cloudproviderscollector.c
-+++ b/src/cloudproviderscollector.c
-@@ -319,12 +319,8 @@ cloud_providers_collector_dup_singleton (void)
-                  self->cancellable,
-                  on_bus_acquired,
-                  self);
-+    }
- 
--      return self;
--    }
--  else
--    {
--      return g_object_ref (self);
--    }
-+  return g_object_ref (self);
- }
- 
--- 
-2.16.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-26 23:04:11 UTC (rev 396674)
+++ PKGBUILD	2020-09-26 23:04:46 UTC (rev 396675)
@@ -1,19 +1,19 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Fina Wilke <fina at felinira.net>
 
 pkgname=libcloudproviders
-pkgver=0.2.5+9+g93dc5ea
-pkgrel=1
+pkgver=0.3.1
+pkgrel=2
 pkgdesc="DBus API that allows cloud storage sync clients to expose their services"
-url="https://gitlab.gnome.org/Incubator/libcloudproviders"
+url="https://gitlab.gnome.org/World/libcloudproviders"
 arch=(x86_64)
 license=(LGPL3)
 depends=(glib2)
-makedepends=(git meson gtk-doc)
-_commit=93dc5ea32d2ae8128cbf88cc336ab5278ddd696e  # master
-source=("git+https://gitlab.gnome.org/Incubator/libcloudproviders.git#commit=$_commit"
-        0001-collector-Always-return-a-new-reference-to-the-singl.patch)
-sha256sums=('SKIP'
-            '64bfe860ece46392258accd56f00f9f0001dec700613d9e484b3459da91a1c13')
+makedepends=(git gobject-introspection meson vala gtk-doc)
+_commit=4672d39320f4ef6091a4977b8e6a4ac079296c26  # tags/0.3.1^0
+source=("git+https://gitlab.gnome.org/World/libcloudproviders.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -22,19 +22,17 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-collector-Always-return-a-new-reference-to-the-singl.patch
 }
 
 build() {
-  arch-meson $pkgname build -Denable-gtk-doc=true
-  ninja -C build
+  arch-meson $pkgname build -D enable-gtk-doc=true
+  meson compile -C build
 }
 
 check() {
-  cd build
-  meson test
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 }