Hello community, here is the log from the commit of package telepathy-haze for openSUSE:Factory checked in at 2016-03-29 14:31:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-haze (Old) and /work/SRC/openSUSE:Factory/.telepathy-haze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-haze" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-haze/telepathy-haze.changes 2016-01-09 23:13:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-haze.new/telepathy-haze.changes 2016-03-29 14:31:21.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jan 5 19:36:33 UTC 2016 - [email protected] + +- Replace *-devel BuildRequires for their pkgconfig counterparts: + + libpurple-devel for pkgconfig(purple). + + libxslt-devel for pkgconfig(libxslt). + + telepathy-glib-devel for pkgconfig(telepathy-glib). +- Add pkgconfig(gobject-2.0), pkgconfig(glib-2.0), + pkgconfig(gio-2.0), pkgconfig(dbus-glib-1) and python-Twisted + BuildRequires: Align with what configure looks for. +- Add th_contact_list_dont_crash_contact_in_roster.patch: + contact-list: Don't crash if a contact is already in the roster. + Patch from upstream git (fdo#47005). + +------------------------------------------------------------------- New: ---- th_contact_list_dont_crash_contact_in_roster.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-haze.spec ++++++ --- /var/tmp/diff_new_pack.2kIPp2/_old 2016-03-29 14:31:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2kIPp2/_new 2016-03-29 14:31:22.000000000 +0200 @@ -26,9 +26,16 @@ Source: http://telepathy.freedesktop.org/releases/telepathy-haze/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM telepathy-haze-pidgin-2.10.12-compat.patch [email protected] -- Fix compatibility with recent versions of Pidgin. Patch0: telepathy-haze-pidgin-2.10.12-compat.patch -BuildRequires: libpurple-devel -BuildRequires: libxslt-devel -BuildRequires: telepathy-glib-devel >= 0.15.1 +# PATCH-FIX-UPSTREAM th_contact_list_dont_crash_contact_in_roster.patch fdo#47005 [email protected] -- contact-list: Don't crash if a contact is already in the roster +Patch1: th_contact_list_dont_crash_contact_in_roster.patch +BuildRequires: python-Twisted +BuildRequires: pkgconfig(dbus-glib-1) >= 0.73 +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.22 +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(purple) >= 2.7 +BuildRequires: pkgconfig(telepathy-glib) >= 0.21 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,6 +45,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure ++++++ th_contact_list_dont_crash_contact_in_roster.patch ++++++ >From e89fecb263550c94a3566c97327955afb8fef19f Mon Sep 17 00:00:00 2001 From: Debarshi Ray <[email protected]> Date: Tue, 28 Apr 2015 19:13:39 +0200 Subject: contact-list: Don't crash if a contact is already in the roster Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47005 diff --git a/src/contact-list.c b/src/contact-list.c index 7397c1d..58b7a9d 100644 --- a/src/contact-list.c +++ b/src/contact-list.c @@ -532,7 +532,8 @@ haze_contact_list_request_subscription (HazeContactList *self, /* If the buddy already exists, then it should already be on the * subscribe list. */ - g_assert (purple_find_buddy (account, bname) == NULL); + if (purple_find_buddy (account, bname) != NULL) + return; buddy = purple_buddy_new (account, bname, NULL); -- cgit v0.10.2
