Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package folks for openSUSE:Factory checked in at 2022-02-13 19:50:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/folks (Old) and /work/SRC/openSUSE:Factory/.folks.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "folks" Sun Feb 13 19:50:30 2022 rev:57 rq:953775 version:0.15.4 Changes: -------- --- /work/SRC/openSUSE:Factory/folks/folks.changes 2022-01-21 01:25:44.822452740 +0100 +++ /work/SRC/openSUSE:Factory/.folks.new.1956/folks.changes 2022-02-13 19:50:43.390161622 +0100 @@ -1,0 +2,8 @@ +Thu Feb 10 19:21:29 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add c44d8e323affd7f1043f300f3325b358cd5b5f0b.patch: + folks-generics: Add missing generic type argument. +- Update our Supplements to current standard. +- Use ldconfig_scriptlets macro for post(un) handling. + +------------------------------------------------------------------- New: ---- c44d8e323affd7f1043f300f3325b358cd5b5f0b.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folks.spec ++++++ --- /var/tmp/diff_new_pack.KiV3yb/_old 2022-02-13 19:50:43.990163221 +0100 +++ /var/tmp/diff_new_pack.KiV3yb/_new 2022-02-13 19:50:43.998163242 +0100 @@ -29,6 +29,8 @@ Group: Development/Libraries/C and C++ URL: http://telepathy.freedesktop.org/wiki/Folks Source: https://download.gnome.org/sources/folks/0.15/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM c44d8e323affd7f1043f300f3325b358cd5b5f0b.patch -- folks-generics: Add missing generic type argument +Patch: https://gitlab.gnome.org/GNOME/folks/-/commit/c44d8e323affd7f1043f300f3325b358cd5b5f0b.patch BuildRequires: gettext BuildRequires: gobject-introspection-devel @@ -114,7 +116,7 @@ %package -n libfolks-eds%{soversion} Summary: Evolution Data Server backend for libfolks Group: System/Libraries -Supplements: packageand(libfolks%{soversion}:evolution-data-server) +Supplements: (libfolks%{soversion} and evolution-data-server) %description -n libfolks-eds%{soversion} libfolks is a library that aggregates people from multiple sources (e.g. @@ -132,7 +134,7 @@ Summary: Additional utilities related to libfolks # the folks-import tool is useful for old pidgin users Group: Development/Libraries/GNOME -Supplements: packageand(libfolks1:pidgin) +Supplements: (libfolks1 and pidgin) %description tools libfolks is a library that aggregates people from multiple sources (e.g. @@ -183,14 +185,9 @@ rm %{buildroot}/usr/share/GConf/gsettings/folks.convert %find_lang folks %{?no_lang_C} -%post -n libfolks%{soversion} -p /sbin/ldconfig -%postun -n libfolks%{soversion} -p /sbin/ldconfig - -%post -n libfolks-eds%{soversion} -p /sbin/ldconfig -%postun -n libfolks-eds%{soversion} -p /sbin/ldconfig - -%post -n libfolks-telepathy%{soversion} -p /sbin/ldconfig -%postun -n libfolks-telepathy%{soversion} -p /sbin/ldconfig +%ldconfig_scriptlets -n libfolks%{soversion} +%ldconfig_scriptlets -n libfolks-eds%{soversion} +%ldconfig_scriptlets -n libfolks-telepathy%{soversion} %files -n libfolks%{soversion} %license COPYING ++++++ c44d8e323affd7f1043f300f3325b358cd5b5f0b.patch ++++++ >From c44d8e323affd7f1043f300f3325b358cd5b5f0b Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <ric...@ubuntu.com> Date: Sun, 30 Jan 2022 19:42:32 +0100 Subject: [PATCH] folks-generics: Add missing generic type argument --- folks/folks-generics.vapi | 2 +- folks/small-set.c | 15 ++++----------- folks/small-set.h | 5 ++++- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/folks/folks-generics.vapi b/folks/folks-generics.vapi index 389025b6..c8a06e96 100644 --- a/folks/folks-generics.vapi +++ b/folks/folks-generics.vapi @@ -37,7 +37,7 @@ namespace Folks internal SmallSet (owned Gee.HashDataFunc<G>? item_hash = null, owned Gee.EqualDataFunc<G>? item_equals = null); - internal static SmallSet<G> copy (Gee.Iterable<G> iterable, + internal static SmallSet<G> copy<G> (Gee.Iterable<G> iterable, owned Gee.HashDataFunc<G>? item_hash = null, owned Gee.EqualDataFunc<G>? item_equals = null); diff --git a/folks/small-set.c b/folks/small-set.c index b5a19683..39790755 100644 --- a/folks/small-set.c +++ b/folks/small-set.c @@ -337,7 +337,10 @@ _folks_small_set_new_take_array (GPtrArray *arr, * Returns: (transfer full): */ FolksSmallSet * -folks_small_set_copy (GeeIterable *iterable, +folks_small_set_copy (GType item_type, + GBoxedCopyFunc item_dup, + GDestroyNotify item_free, + GeeIterable *iterable, GeeHashDataFunc item_hash, gpointer item_hash_data, GDestroyNotify item_hash_data_free, @@ -347,10 +350,6 @@ folks_small_set_copy (GeeIterable *iterable, { FolksSmallSet *self; GeeIterator *iter; - GeeTraversableIface *traversable_iface; - GType item_type; - GBoxedCopyFunc item_dup; - GDestroyNotify item_free; /* Deliberately not allowing for subclasses here: this class is not * subclassable, and it's slower if we do check for subclasses. */ @@ -376,12 +375,6 @@ folks_small_set_copy (GeeIterable *iterable, return self; } - traversable_iface = GEE_TRAVERSABLE_GET_INTERFACE (iterable); - g_assert (traversable_iface != NULL); - item_type = traversable_iface->get_g_type ((GeeTraversable *) iterable); - item_dup = traversable_iface->get_g_dup_func ((GeeTraversable *) iterable); - item_free = traversable_iface->get_g_destroy_func ((GeeTraversable *) iterable); - self = folks_small_set_new (item_type, item_dup, item_free, item_hash, item_hash_data, item_hash_data_free, item_equals, item_equals_data, item_equals_data_free); diff --git a/folks/small-set.h b/folks/small-set.h index e61f387e..5df54ce3 100644 --- a/folks/small-set.h +++ b/folks/small-set.h @@ -68,7 +68,10 @@ folks_small_set_empty (GType item_type, GBoxedCopyFunc item_dup, GDestroyNotify item_free); -FolksSmallSet *folks_small_set_copy (GeeIterable *iterable, +FolksSmallSet *folks_small_set_copy (GType item_type, + GBoxedCopyFunc item_dup, + GDestroyNotify item_free, + GeeIterable *iterable, GeeHashDataFunc item_hash, gpointer item_hash_data, GDestroyNotify item_hash_data_free, -- GitLab
