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

Jan Steffens heftig at archlinux.org
Tue Jan 30 09:24:28 UTC 2018


    Date: Tuesday, January 30, 2018 @ 09:24:21
  Author: heftig
Revision: 315607

0.2.5+9+g93dc5ea-1

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

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

Added: 0001-collector-Always-return-a-new-reference-to-the-singl.patch
===================================================================
--- 0001-collector-Always-return-a-new-reference-to-the-singl.patch	                        (rev 0)
+++ 0001-collector-Always-return-a-new-reference-to-the-singl.patch	2018-01-30 09:24:21 UTC (rev 315607)
@@ -0,0 +1,39 @@
+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	2018-01-30 09:20:43 UTC (rev 315606)
+++ PKGBUILD	2018-01-30 09:24:21 UTC (rev 315607)
@@ -2,17 +2,19 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=libcloudproviders
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.2.5+9+g93dc5ea
+pkgrel=1
 pkgdesc="DBus API that allows cloud storage sync clients to expose their services"
-url="https://gitlab.gnome.org/External/libcloudproviders"
+url="https://gitlab.gnome.org/Incubator/libcloudproviders"
 arch=(x86_64)
 license=(LGPL3)
 depends=(glib2)
 makedepends=(git meson gtk-doc)
-_commit=6fc78d1ac63400a098037d14984eaadba5ad6526  # tags/0.2.5^0
-source=("git+https://gitlab.gnome.org/External/libcloudproviders.git#commit=$_commit")
-sha256sums=('SKIP')
+_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')
 
 pkgver() {
   cd $pkgname
@@ -21,6 +23,7 @@
 
 prepare() {
   cd $pkgname
+  patch -Np1 -i ../0001-collector-Always-return-a-new-reference-to-the-singl.patch
 }
 
 build() {



More information about the arch-commits mailing list