.gitignore

@@ -10,9 +10,3 @@ zeitgeist-0.5.0.tar.gz
 /zeitgeist-0.9.13.tar.xz
 /zeitgeist-0.9.14.tar.xz
 /zeitgeist-0.9.16.20140808gitce9affa.tar.gz
-/zeitgeist-0.9.16.tar.xz
-/zeitgeist-1.0.tar.xz
-/zeitgeist-1.0.1.tar.xz
-/zeitgeist-1.0.2.tar.xz
-/zeitgeist-1.0.3.tar.xz
-/zeitgeist-1.0.4.tar.xz

0001-Fix-unit-tests.patch

@@ -0,0 +1,60 @@
+From 42f0f6b0f17a584b703981b8a392c3225c7a8e98 Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif@lotfy.com>
+Date: Thu, 2 Jan 2014 08:09:01 +0100
+Subject: [PATCH 01/12] 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);
+ }
+ 
+-- 
+2.0.4
+

0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch

@@ -0,0 +1,43 @@
+From c753eed33a0d5d7c7869cb9c75bfab0fccba51c5 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 3 Jan 2014 16:27:21 -0500
+Subject: [PATCH 02/12] Don't spam the logs with warnings that aren't really
+ warnings
+
+Use debug instead
+
+Signed-off-by: Seif Lotfy <seif@lotfy.com>
+---
+ datahub/recent-manager-provider.vala | 2 +-
+ datahub/utils.vala                   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/datahub/recent-manager-provider.vala b/datahub/recent-manager-provider.vala
+index 810ed6a..67a4808 100644
+--- a/datahub/recent-manager-provider.vala
++++ b/datahub/recent-manager-provider.vala
+@@ -129,7 +129,7 @@ public class RecentManagerGtk : DataProvider
+ 
+       if (desktop_file == null)
+       {
+-        warning ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s",
++        debug ("Desktop file for \"%s\" was not found, exec: %s, mime_type: %s",
+                  uri, exec[0], ri.get_mime_type ());
+         continue; // this makes us sad panda
+       }
+diff --git a/datahub/utils.vala b/datahub/utils.vala
+index bd14e45..b914636 100644
+--- a/datahub/utils.vala
++++ b/datahub/utils.vala
+@@ -44,7 +44,7 @@ public class Utils : Object
+     }
+     catch (Error err)
+     {
+-      warning ("Couldn't get file contents %s: %s", file.get_path (), err.message);
++      debug ("Couldn't get file contents %s: %s", file.get_path (), err.message);
+     }
+     contents = (string) contents_array;
+ #else
+-- 
+2.0.4
+

0003-bump-version-number-and-release-name.patch

@@ -0,0 +1,52 @@
+From c1873620ad2d83af3e87dd82fdcf56b5e70a27ce Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif@lotfy.com>
+Date: Wed, 15 Jan 2014 08:16:03 +0100
+Subject: [PATCH 03/12] bump version number and release name
+
+---
+ NEWS         | 12 +++++++++++-
+ configure.ac |  4 ++--
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index e6f3352..15eb582 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,14 @@
+-2013-xx-xx: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond"
++2014-01-15: Zeitgeist 0.9.15 (1.0 Beta 7) "Bazooka"
++---------------------------------------------------------------
++
++Libzeitgeist:
++ - Fix converting variants to event lists
++
++Datahub:
++ - change some warnings to debugs
++
++
++2013-06-30: Zeitgeist 0.9.14 (1.0 Beta 6) "Diamond"
+ ---------------------------------------------------------------
+ 
+ Libzeitgeist:
+diff --git a/configure.ac b/configure.ac
+index d244420..acf7daa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([zeitgeist], [0.9.14], [dev@lists.zeitgeist-project.com], [zeitgeist])
++AC_INIT([zeitgeist], [0.9.15], [dev@lists.zeitgeist-project.com], [zeitgeist])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS(config.h)
+@@ -13,7 +13,7 @@ AC_PROG_CXX
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+-AM_PROG_VALAC([0.20.0])
++AM_PROG_VALAC([0.22.0])
+ AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No Vala compiler found."])])
+ 
+ AM_SILENT_RULES([yes])
+-- 
+2.0.4
+

0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch

@@ -0,0 +1,46 @@
+From b25d01246371ba0688fee6baa718e50c22d861c2 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Wed, 15 Jan 2014 08:36:47 +0100
+Subject: [PATCH 04/12] Fix unit test failure if $XDG_DATA_DIRS is not set
+
+In that case g_setenv() would fail trying to set a NULL value in teardown.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73651
+
+Signed-off-by: Seif Lotfy <seif@lotfy.com>
+---
+ test/c/test-datasource.c | 3 ++-
+ test/c/test-event.c      | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
+index 067da55..3e3ce01 100644
+--- a/test/c/test-datasource.c
++++ b/test/c/test-datasource.c
+@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
+ static void
+ teardown (Fixture *fix, gconstpointer data)
+ {
+-  g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
++  if (old_xdg_data_dirs != NULL)
++    g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
+ }
+ 
+ static void
+diff --git a/test/c/test-event.c b/test/c/test-event.c
+index 440d3c3..abd7718 100644
+--- a/test/c/test-event.c
++++ b/test/c/test-event.c
+@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
+ static void
+ teardown (Fixture *fix, gconstpointer data)
+ {
+-  g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
++  if (old_xdg_data_dirs != NULL)
++    g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
+ }
+ 
+ static void
+-- 
+2.0.4
+

0005-Replace-with-1.patch

@@ -0,0 +1,27 @@
+From 74387d7e1eab84323ca4615caa955bdb5bbe7170 Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif@lotfy.com>
+Date: Mon, 27 Jan 2014 22:45:42 +0100
+Subject: [PATCH 05/12] Replace \+ with \{1,\)
+
+This command /usr/bin/sed -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la
+does not work on FreeBSD because \+ is not in basic regular expression.
+---
+ libzeitgeist/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
+index 67e9563..f44e950 100644
+--- a/libzeitgeist/Makefile.am
++++ b/libzeitgeist/Makefile.am
+@@ -186,7 +186,7 @@ MAINTAINERCLEANFILES =
+ # We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
+ # This is what g-ir-scanner does.
+ libzeitgeist_dlname = \
+-	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
++	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\{1,\}\)'/\1/p" libzeitgeist-2.0.la`
+ 
+ if HAVE_INTROSPECTION
+ libzeitgeist_2_0_gir_VALASOURCES = \
+-- 
+2.0.4
+

0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch

@@ -0,0 +1,22 @@
+From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip@tecnocode.co.uk>
+Date: Sun, 16 Feb 2014 15:08:49 +0000
+Subject: [PATCH 06/12] libzeitgeist: Add a missing dependency on gio-2.0
+
+This actually makes the zeitgeist vapi file usable.
+
+Signed-off-by: Seif Lotfy <seif@lotfy.com>
+---
+ libzeitgeist/zeitgeist-2.0.deps | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
+index ff8d39b..59eec5d 100644
+--- a/libzeitgeist/zeitgeist-2.0.deps
++++ b/libzeitgeist/zeitgeist-2.0.deps
+@@ -1 +1,2 @@
+ zeitgeist-datamodel-2.0
++gio-2.0
+-- 
+2.0.4
+

0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch

@@ -0,0 +1,49 @@
+From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001
+From: Seif Lotfy <seif@lotfy.com>
+Date: Tue, 4 Mar 2014 20:55:53 +0100
+Subject: [PATCH 07/12] Replace get_nprocs_conf with g_get_num_processors()
+
+---
+ libzeitgeist/log.vala | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index 02b16ca..f0b65cb 100644
+--- a/libzeitgeist/log.vala
++++ b/libzeitgeist/log.vala
+@@ -40,6 +40,7 @@
+  * Zeitgeist also comes with a blacklist extension to make sure the user
+  * always stays in control of what information is logged.
+  */
++
+ namespace Zeitgeist
+ {
+ 
+@@ -58,8 +59,8 @@ namespace Zeitgeist
+  */
+ public class Log : QueuedProxyWrapper
+ {
+-    [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")]
+-    extern static int get_nprocs_conf ();
++    [CCode (cname = "g_get_num_processors")]
++    private extern static uint get_num_processors ();
+ 
+     class DbWorker
+     {
+@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper
+         try {
+             threads = new ThreadPool<DbWorker>.with_owned_data ((worker) => {
+                 worker.run ();
+-            }, get_nprocs_conf (), true);
++            }, (int) get_num_processors (), true);
+         } catch (ThreadError err) {
+             warning ("%s", err.message);
+             threads = null;
+@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper
+ 
+ }
+ 
+-// vim:expandtab:ts=4:sw=4
+-- 
+2.0.4
+

0008-ontology2code-don-t-hardcode-python-path.patch

@@ -0,0 +1,25 @@
+From d36d90fd0366b84c2e466963c49ad4b48ca740cb Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Sat, 15 Mar 2014 11:40:10 -0400
+Subject: [PATCH 08/12] ontology2code: don't hardcode python path
+
+Use the typical /usr/bin/env trick to find python.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73837
+---
+ data/ontology2code | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/ontology2code b/data/ontology2code
+index 988e711..b8efbfd 100755
+--- a/data/ontology2code
++++ b/data/ontology2code
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#! /usr/bin/env python
+ # -.- coding: utf-8 -.-
+ 
+ # Zeitgeist
+-- 
+2.0.4
+

0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch

@@ -0,0 +1,29 @@
+From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Mon, 17 Mar 2014 20:57:49 +0100
+Subject: [PATCH 10/12] WhereClause: Fix array-length to work with string.joinv
+ of vala-0.24
+
+---
+ libzeitgeist/where-clause.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala
+index a830599..d981914 100644
+--- a/libzeitgeist/where-clause.vala
++++ b/libzeitgeist/where-clause.vala
+@@ -211,7 +211,11 @@ namespace Zeitgeist
+          */
+         private T[] generic_array_to_unowned_array<T> (GenericArray<T> gptrarr)
+         {
++#if VALA_0_24
++            long[] pointers = new long[gptrarr.length];
++#else
+             long[] pointers = new long[gptrarr.length + 1];
++#endif
+             Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata,
+                 (gptrarr.length) * sizeof (void *));
+             return (T[]) pointers;
+-- 
+2.0.4
+

0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch

@@ -0,0 +1,140 @@
+From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Mon, 17 Mar 2014 21:02:01 +0100
+Subject: [PATCH 11/12] Require glib >= 2.35.4 according to the usage of
+ g_get_num_processors()
+
+Bump vala buildflags accordingly
+---
+ configure.ac                 | 2 +-
+ datahub/Makefile.am          | 2 +-
+ examples/vala/Makefile.am    | 2 +-
+ extensions/Makefile.am       | 2 +-
+ extensions/fts++/Makefile.am | 2 +-
+ libzeitgeist/Makefile.am     | 2 +-
+ libzeitgeist/log.vala        | 3 ---
+ src/Makefile.am              | 2 +-
+ test/direct/Makefile.am      | 2 +-
+ 9 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index acf7daa..45f50c7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
+ 
+-GLIB_REQUIRED=2.26.0
++GLIB_REQUIRED=2.35.4
+ SQLITE_REQUIRED=3.7.11
+ VALADOC_REQUIRED=0.2
+ 
+diff --git a/datahub/Makefile.am b/datahub/Makefile.am
+index 9629baa..19bcb3b 100644
+--- a/datahub/Makefile.am
++++ b/datahub/Makefile.am
+@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg gio-unix-2.0 \
+ 	--pkg gtk+-3.0 \
+diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am
+index 99584e6..b7cd7c2 100644
+--- a/examples/vala/Makefile.am
++++ b/examples/vala/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	$(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \
+ 	$(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 20139aa..72b9e24 100644
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg sqlite3 \
+ 	--pkg gmodule-2.0 \
+diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
+index 8bd9936..0ebf206 100644
+--- a/extensions/fts++/Makefile.am
++++ b/extensions/fts++/Makefile.am
+@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg sqlite3 \
+ 	--pkg posix \
+diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
+index f44e950..9af0cb4 100644
+--- a/libzeitgeist/Makefile.am
++++ b/libzeitgeist/Makefile.am
+@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg gio-unix-2.0 \
+ 	--pkg sqlite3 \
+diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
+index f0b65cb..3de1c7d 100644
+--- a/libzeitgeist/log.vala
++++ b/libzeitgeist/log.vala
+@@ -59,9 +59,6 @@ namespace Zeitgeist
+  */
+ public class Log : QueuedProxyWrapper
+ {
+-    [CCode (cname = "g_get_num_processors")]
+-    private extern static uint get_num_processors ();
+-
+     class DbWorker
+     {
+         private unowned ThreadFunc<void*> func;
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3deb6c2..65751ef 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg sqlite3 \
+ 	--pkg posix \
+diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
+index 80279d4..59e9f5f 100644
+--- a/test/direct/Makefile.am
++++ b/test/direct/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ AM_VALAFLAGS = \
+-	--target-glib=2.26 \
++	--target-glib=2.36 \
+ 	--pkg gio-2.0 \
+ 	--pkg gio-unix-2.0 \
+ 	--pkg sqlite3 \
+-- 
+2.0.4
+

0012-tools-Drop-rogue-leading-unicode-character.patch

@@ -0,0 +1,22 @@
+From ce9affa87a8775ef4c45d7508d1b519319b9162a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Thu, 3 Jul 2014 09:39:05 +0200
+Subject: [PATCH 12/12] tools: Drop rogue leading unicode character
+
+---
+ tools/development/cairoplot.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/development/cairoplot.py b/tools/development/cairoplot.py
+index b39f765..8b1c564 100644
+--- a/tools/development/cairoplot.py
++++ b/tools/development/cairoplot.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+ # CairoPlot.py
+-- 
+2.0.4
+

sources

@@ -1 +1 @@
-SHA512 (zeitgeist-1.0.4.tar.xz) = d474f02b520d2d4990d93f3c81a6398f8bea0ff22a10b216e2e027ba6424cee5967ce0648bb01998e185b5b9274bf59a2a723a1abab447d954f10862721f050b
+92371b864515389ffe7d70569f0bc9ed  zeitgeist-0.9.14.tar.xz

zeitgeist-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch

@@ -1,39 +0,0 @@
-From 1be2a5fff77cdf61c843edc8356dfdef3fd2dbfc Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Fri, 9 Sep 2022 14:49:27 +0200
-Subject: [PATCH] datahub: Fix wrong parameter for Event.full() ctor
-
-Thanks to Mamoru TASAKA
-
-Fixes https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19
----
- datahub/telepathy-observer.vala | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/datahub/telepathy-observer.vala b/datahub/telepathy-observer.vala
-index cd670d06..bb34581c 100644
---- a/datahub/telepathy-observer.vala
-+++ b/datahub/telepathy-observer.vala
-@@ -96,8 +96,7 @@ public class TelepathyObserver : DataProvider
-                               ZG.ACCESS_EVENT,
-                               "",
-                               actor,
--                              null,
--                              obj_path);
-+                              null, null);
- 
-     /*
-      * Whether user initiated the chat or not
-@@ -217,8 +216,7 @@ public class TelepathyObserver : DataProvider
-                               ZG.ACCESS_EVENT,
-                               ZG.USER_ACTIVITY,
-                               actor,
--                              null,
--                              obj_path);
-+                              null, null);
-     if (!channel.requested)
-       event_template.manifestation = ZG.WORLD_ACTIVITY;
-     /*
--- 
-2.37.3
-

zeitgeist.spec

@@ -1,83 +1,58 @@
 Name:           zeitgeist
-Version:        1.0.4
-Release:        25%{?dist}
+Version:        0.9.16
+Release:        0.3.20140808.git.ce9affa%{?dist}
 Summary:        Framework providing Desktop activity awareness
-
-# data/ontology/*.trig	BSD-3-Clause OR CC-BY-SA-3.0 -> main
-#   Original: https://sourceforge.net/projects/oscaf/files/shared-desktop-ontologies/0.7/shared-desktop-ontologies-0.7.1.tar.bz2/
-#   See: LICENSE.CC-BY in the above tarball
-# data/ontology2code	 LGPL-2.0-or-later
-# datahub/	 LGPL-3.0-or-later -> main
-# doc/libzeitgeist/docs_vala/scripts.js	LGPL-2.0-or-later
-# examples/c/	 GPL-3.0-only
-# extensions/*.c	LGPL-2.0-or-later
-# extensions/fts++/	GPL-2.0-or-later -> main
-# libzeitgeist/		LGPL-2.0-or-later
-# python/*.py	LGPL-2.0-or-later
-# src/	(except for some files) LGPL-2.0-or-later
-# src/notify.vala	GPL-2.0-or-later -> main
-# test/c/	GPL-3.0-only
-# test/	(other files) LGPL-2.0-or-later
-# tools/	(except for some files) LGPL-2.0-or-later
-# tools/zeitgeist-explorer/	GPL-2.0-or-later
-
-# SPDX confirmed
-License:        LGPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-2.0-or-later AND (BSD-3-Clause OR CC-BY-SA-3.0)
-
-URL:            https://launchpad.net/zeitgeist
-Source0:        %{url}/1.0/%{version}/+download/%{name}-%{version}.tar.xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1779103
-# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/issues/19
-Patch1:         %{name}-1.0.4-0001-datahub-Fix-wrong-parameter-for-Event.full-ctor.patch
-
-BuildRequires:  gcc-c++
+# most of the source code is LGPLv2+, except:
+# datahub/ is LGPLv3+
+# examples/c/ is GPLv3
+# extensions/fts++/ is GPLv2+
+# src/notify.vala: GPLv2+
+# test/c/ is GPLv3
+# tools/zeitgeist-explorer/ is GPLv2+
+License:        LGPLv2+ and LGPLv3+ and GPLv2+
+URL:            http://zeitgeist-project.com/
+Source0:        http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-0.9.14.tar.xz
+Patch0:         0001-Fix-unit-tests.patch
+Patch1:         0002-Don-t-spam-the-logs-with-warnings-that-aren-t-really.patch
+Patch2:         0003-bump-version-number-and-release-name.patch
+Patch3:         0004-Fix-unit-test-failure-if-XDG_DATA_DIRS-is-not-set.patch
+Patch4:         0005-Replace-with-1.patch
+Patch5:         0006-libzeitgeist-Add-a-missing-dependency-on-gio-2.0.patch
+Patch6:         0007-Replace-get_nprocs_conf-with-g_get_num_processors.patch
+Patch7:         0008-ontology2code-don-t-hardcode-python-path.patch
+Patch8:         0010-WhereClause-Fix-array-length-to-work-with-string.joi.patch
+Patch9:         0011-Require-glib-2.35.4-according-to-the-usage-of-g_get_.patch
+Patch10:        0012-tools-Drop-rogue-leading-unicode-character.patch
+BuildRequires:  dbus-devel
+BuildRequires:  dee-devel
 BuildRequires:  gettext
-BuildRequires:  make
-BuildRequires:  python3-devel
-BuildRequires:  python3-rdflib
-BuildRequires:  systemd
+BuildRequires:  glib2-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk3-devel
+BuildRequires:  intltool
+BuildRequires:  json-glib-devel
+BuildRequires:  python2-devel
+BuildRequires:  python-rdflib
+BuildRequires:  raptor2
+BuildRequires:  sqlite-devel
+BuildRequires:  telepathy-glib-devel
 BuildRequires:  vala
 BuildRequires:  xapian-core-devel
-
-BuildRequires:  pkgconfig(dee-icu-1.0)
-BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(telepathy-glib)
-
-BuildRequires:	/usr/bin/dbus-run-session
-
-%{?systemd_requires}
-
 Requires:       dbus
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       python-%{name} = %{version}-%{release}
 Obsoletes:      zeitgeist-datahub < 0.9.5-4
-Obsoletes:      python2-%{name} < 1.0.2-1
 
 %description
 Zeitgeist is a service which logs the users's activities and events (files
 opened, websites visites, conversations hold with other people, etc.) and
 makes relevant information available to other applications.
+
 Note that this package only contains the daemon, which you can use
 together with several different user interfaces.
 
-%package -n python3-zeitgeist
-Summary:        Python 3 bindings for zeitgeist
-License:        LGPL-2.0-or-later
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-
-# manually specify runtime dependencies (no metadata)
-Requires:       python3dist(dbus-python)
-
-%description -n python3-zeitgeist
-This package contains the Python 3 bindings for zeitgeist.
-
 %package        libs
 Summary:        Client library for interacting with the Zeitgeist daemon
-License:        LGPL-2.0-or-later
+License:        LGPLv2+
 
 %description    libs
 Libzeitgeist is a client library for interacting with the Zeitgeist
@@ -85,37 +60,42 @@ daemon.
 
 %package        devel
 Summary:        Development files for %{name}
-License:        LGPL-2.0-or-later
+License:        LGPLv2+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 This package contains libraries and header files for
 developing applications that use %{name}.
 
+%package -n     python-%{name}
+Summary:        Python 2 bindings for %{name}
+BuildArch:      noarch
+Requires:       dbus-python
+Requires:       pyxdg
+Requires:       %{name} = %{version}-%{release}
+
+%description -n python-%{name}
+This package contains Python 2 API for
+developing applications that use %{name}.
 
 %prep
-%autosetup -p1
-# Regenerate C source from vala source
-find -name '*.vala' -exec touch {} \;
+%setup -qn %{name}-0.9.14
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 ## nuke unwanted rpaths, see also
 ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
-# The following two are hard to get enabled...
-%if 0
-sed -i.disable test/direct/Makefile.in \
-	-e 's|log-test\$(EXEEXT) \\|\\|'
-sed -i.disable test/c/Makefile.in \
-	-e 's|test-log\$(EXEEXT) \\|\\|'
-%endif
-
-# python 3.11 removes inspect.getargspec (bug 2159916)
-# https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/26
-# https://docs.python.org/3.11/whatsnew/3.11.html#removed
-sed -i.py311 python/client.py \
-	-e 's|inspect.getargspec|inspect.getfullargspec|'
-
 %build
 %configure --enable-fts --enable-datahub --disable-silent-rules
 %make_build
@@ -129,61 +109,27 @@ find %{buildroot} -name '*.la' -delete -print
 rm -frv %{buildroot}%{_datadir}/zeitgeist/doc
 
 %check
-cat > test-script <<EOF
-#!/bin/bash
-set -x
+make check || true
 
-PATH_ORIG=\${PATH}
-export PATH=\${PATH_ORIG}:%{buildroot}%{_bindir}
-export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
-
-zeitgeist-daemon &
-exec make check
-EOF
-
-chmod 0700 ./test-script
-dbus-run-session -- ./test-script
-
-%post
-%systemd_user_post %{name}.service
-%systemd_user_post %{name}-fts.service
-
-%preun
-%systemd_user_preun %{name}.service
-%systemd_user_preun %{name}-fts.service
-
-%ldconfig_scriptlets libs
+%post libs -p /sbin/ldconfig
 
+%postun libs -p /sbin/ldconfig
 
 %files
-%doc AUTHORS
-%doc NEWS
-%license COPYING
-%license COPYING.GPL
-
+%doc AUTHORS COPYING COPYING.GPL NEWS
 %{_bindir}/zeitgeist-daemon
 %{_bindir}/zeitgeist-datahub
-%dir	%{_libexecdir}/%{name}/
-%{_libexecdir}/%{name}/zeitgeist-fts
-
-%dir	%{_datadir}/%{name}/
-%dir	%{_datadir}/%{name}/ontology/
-%{_datadir}/%{name}/ontology/*.trig
+%{_libexecdir}/zeitgeist-fts
+%{_datadir}/%{name}/
 %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/zeitgeist-daemon
 %{_mandir}/man1/zeitgeist-*.*
-
 %config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop
-%{_userunitdir}/%{name}.service
-%{_userunitdir}/%{name}-fts.service
-
-%files -n python3-zeitgeist
-%{python3_sitelib}/zeitgeist/
 
 %files libs
-%license COPYING
+%doc COPYING
 %{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib
 %{_libdir}/libzeitgeist-2.0.so.*
 
@@ -191,7 +137,6 @@ dbus-run-session -- ./test-script
 %{_includedir}/zeitgeist-2.0/
 %{_libdir}/libzeitgeist-2.0.so
 %{_libdir}/pkgconfig/zeitgeist-2.0.pc
-
 %{_datadir}/gir-1.0/Zeitgeist-2.0.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
@@ -199,174 +144,10 @@ dbus-run-session -- ./test-script
 %{_datadir}/vala/vapi/zeitgeist-2.0.vapi
 %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
 
+%files -n python-%{name}
+%{python2_sitelib}/zeitgeist/
+
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1.0.4-24
-- Rebuilt for Python 3.15
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.0.4-22
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.0.4-21
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jun 12 2025 Python Maint <python-maint@redhat.com> - 1.0.4-19
-- Rebuilt for Python 3.14
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Aug 16 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-17
-- execute test program which require dbus and zeitgeist-daemon
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sun Jun 16 2024 Python Maint <python-maint@redhat.com> - 1.0.4-15
-- Rebuilt for Python 3.13
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-13
-- Regenerate C source from Vala source and enable
-  -Werror=incompatible-pointer-types again
-  (Thanks to Florian Weimer <fweimer@redhat.com>)
-
-* Thu Jan 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-12
-- Change -Wincompatible-pointer-types from error to warning
-
-* Sun Dec 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-11
-- SPDX migration
-
-* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.0.4-9
-- Rebuilt for Python 3.12
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-7
-- F-37+: Replace inspect.getargspec removed on python3.11 (bug 2159916)
-
-* Sat Sep 10 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-6
-- Upstream patch: datahub: Fix wrong parameter for Event.full() ctor
-  (Upstream bug 19, RH bug 1779103)
-
-* Thu Sep  8 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.4-5
-- Make make check error fatal
-- Disable tests currently hard to get passed
-- Make main package EVR aware for -libs subpackage
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.4-3
-- Rebuilt for Python 3.11
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jan 12 2022 Fabio Valentini <decathorpe@gmail.com> - 1.0.4-1
-- Update to version 1.0.4.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.3-5
-- Rebuilt for Python 3.10
-
-* Tue Apr 20 2021 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-4
-- Include upstream patches for vala 0.52 support.
-
-* Sun Mar 14 2021 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-3
-- Reintroduce Python bindings, they support Python 3 since version 1.0.3.
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 15 2020 David King <amigadave@amigadave.com> - 1.0.3-1
-- Update to 1.0.3 (#1888547)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Sep 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.2-1
-- Update to version 1.0.2.
-- Drop unused python bindings.
-- Drop unnecessary patches.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 29 2019 David King <amigadave@amigadave.com> - 1.0.1-1
-- Update to 1.0.1
-- Fix VAPI file for recent Vala (#1668410)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Feb 10 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.0-7
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Sep 21 2017 David King <amigadave@amigadave.com> - 1.0-5
-- Fix service file variable substitution (#1464693)
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Tue Feb 21 2017 David King <amigadave@amigadave.com> - 1.0-1
-- Update to 1.0
-- Use pkgconfig for BuildRequires
-- Use python_provide macro
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 26 2016 Peter Robinson <pbrobinson@fedoraproject.org> 0.9.16-4
-- Rebuild (xapian 1.4)
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.16-3
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Aug 07 2015 Christopher Meng <rpm@cicku.me> - 0.9.16-1
-- Update to 0.9.16
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.16-0.5.20140808.git.ce9affa
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.9.16-0.4.20140808.git.ce9affa
-- Rebuilt for GCC 5 C++11 ABI change
-
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.16-0.3.20140808.git.ce9affa
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild