diff --git a/srcpkgs/libcloudproviders/patches/0001-collector-Always-return-a-new-reference-to-the-singl.patch b/srcpkgs/libcloudproviders/patches/0001-collector-Always-return-a-new-reference-to-the-singl.patch deleted file mode 100644 index c6e3a976b1b..00000000000 --- a/srcpkgs/libcloudproviders/patches/0001-collector-Always-return-a-new-reference-to-the-singl.patch +++ /dev/null @@ -1,39 +0,0 @@ - -m 2e11b93fa0a7f3ac97b894ad0c3ed58bde73d7b4 Mon Sep 17 00:00:00 2001 -Message-Id: <2e11b93fa0a7f3ac97b894ad0c3ed58bde73d7b4.1517303991.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" -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(-) - ---- src/cloudproviderscollector.c -+++ 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 - - diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template index 8ca7dd067a5..6f1f0ae4dff 100644 --- a/srcpkgs/libcloudproviders/template +++ b/srcpkgs/libcloudproviders/template @@ -1,24 +1,37 @@ # Template file for 'libcloudproviders' pkgname=libcloudproviders -version=0.2.5 -revision=2 -wrksrc="${pkgname}-${version}-6fc78d1ac63400a098037d14984eaadba5ad6526" +version=0.3.0 +revision=1 build_style=meson -hostmakedepends="pkg-config glib-devel" +configure_args="-Dintrospection=$(vopt_if true false) + -Dvapigen=$(vopt_if vala true false)" +hostmakedepends="pkg-config glib-devel $(vopt_if gir 'gobject-introspection') + $(vopt_if vala 'vala-devel')" makedepends="libglib-devel" short_desc="DBus API for cloud storage sync clients to expose their services" maintainer="maxice8 " license="LGPL-3.0-or-later" homepage="https://gitlab.gnome.org/Incubator/libcloudproviders" -distfiles="https://gitlab.gnome.org/Incubator/libcloudproviders/repository/${version}/archive.tar.gz" -checksum=6fcce3bc523411980132d258befd1893dcddb08638551a6275606bcad1737bb0 +distfiles="${homepage}/-/archive/${version}/libcloudproviders-${version}.tar.gz" +checksum=15c9d82885baa101eb2542d7de1fcba4824e885726bee07c2b9d8f938b0bcadd + +build_options="gir vala" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir vala" +fi libcloudproviders-devel_package() { - depends="${sourcepkg}>=${version}_${revision} glib-devel" + depends="${sourcepkg}-${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi } }