Hello community, here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at 2014-06-19 13:19:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zeitgeist (Old) and /work/SRC/openSUSE:Factory/.zeitgeist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zeitgeist" Changes: -------- --- /work/SRC/openSUSE:Factory/zeitgeist/zeitgeist.changes 2013-06-25 14:47:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zeitgeist.new/zeitgeist.changes 2014-06-19 13:20:01.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 12 21:13:18 UTC 2014 - [email protected] + +- Add zeitgeist-bnc876272-event-crash.patch: fix possible crash + with a Google Talk account in empathy (bnc#876272). + +------------------------------------------------------------------- New: ---- zeitgeist-bnc876272-event-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.h1yKVV/_old 2014-06-19 13:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.h1yKVV/_new 2014-06-19 13:20:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zeitgeist # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Dominique Leuenberger, Amsterdam, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -25,6 +25,8 @@ Group: Productivity/Other Url: https://launchpad.net/zeitgeist Source: https://launchpad.net/zeitgeist/0.9/%{version}/+download/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM zeitgeist-bnc876272-event-crash.patch bnc#876272 [email protected] -- fix crash when sending events over D-Bus. +Patch0: zeitgeist-bnc876272-event-crash.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libxapian-devel @@ -89,6 +91,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ ++++++ zeitgeist-bnc876272-event-crash.patch ++++++ >From 42f0f6b0f17a584b703981b8a392c3225c7a8e98 Mon Sep 17 00:00:00 2001 From: Seif Lotfy <[email protected]> Date: Thu, 2 Jan 2014 08:09:01 +0100 Subject: [PATCH] Fix unit-tests Currently the unit tests failed when loading the xdg directories and also it seems like optimizing the event variant lead to a segfault when converting back via from_variant with several events --- libzeitgeist/event.vala | 4 ++-- test/c/test-datasource.c | 3 +-- test/c/test-event.c | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libzeitgeist/event.vala b/libzeitgeist/event.vala index 67fe47f..0cd708c 100644 --- a/libzeitgeist/event.vala +++ b/libzeitgeist/event.vala @@ -292,8 +292,8 @@ public class Event : Object } Variant event_variant = vb.end ().get_normal_form (); - Variant ret = optimize_variant_allocation (event_variant); - return ret; + //Variant ret = optimize_variant_allocation (event_variant); + return event_variant; } private Variant optimize_variant_allocation (Variant event_variant) { diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c index a60d48b..067da55 100644 --- a/test/c/test-datasource.c +++ b/test/c/test-datasource.c @@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; static void setup (Fixture *fix, gconstpointer data) { - if (old_xdg_data_dirs != NULL) - old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); } diff --git a/test/c/test-event.c b/test/c/test-event.c index 746de3d..440d3c3 100644 --- a/test/c/test-event.c +++ b/test/c/test-event.c @@ -35,8 +35,7 @@ static const gchar *old_xdg_data_dirs = NULL; static void setup (Fixture *fix, gconstpointer data) { - if (old_xdg_data_dirs != NULL) - old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + old_xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); g_setenv ("XDG_DATA_DIRS", TEST_DIR, TRUE); } -- 1.8.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
